From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 26 Sep 2011 13:10:54 +0000 (+0300)
Subject: Rotate wielded tool the right way and modify axe graphics accordingly
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=9a7471b74085973a19c192737f3dbcfe43926b52;p=zefram%2Fminetest%2Fminetest_engine.git

Rotate wielded tool the right way and modify axe graphics accordingly
---

diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png
index 390dbb08..0ad23c93 100644
Binary files a/data/tool_steelaxe.png and b/data/tool_steelaxe.png differ
diff --git a/data/tool_stoneaxe.png b/data/tool_stoneaxe.png
index 0c5414af..698ac918 100644
Binary files a/data/tool_stoneaxe.png and b/data/tool_stoneaxe.png differ
diff --git a/data/tool_woodaxe.png b/data/tool_woodaxe.png
index 34f54eff..3daa4af7 100644
Binary files a/data/tool_woodaxe.png and b/data/tool_woodaxe.png differ
diff --git a/src/camera.cpp b/src/camera.cpp
index 1a533049..34226b90 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -208,7 +208,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
 		#if 1
 		f32 bobknob = 1.2;
 		f32 bobtmp = sin(pow(bobfrac, bobknob) * PI);
-		f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
+		//f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
 
 		v3f bobvec = v3f(
 			0.3 * bobdir * sin(bobfrac * PI),
@@ -265,7 +265,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
 
 	// Position the wielded item
 	v3f wield_position = v3f(45, -35, 65);
-	v3f wield_rotation = v3f(90, -90, -90);
+	v3f wield_rotation = v3f(-100, 110, -100);
 	if (m_digging_button != -1)
 	{
 		f32 digfrac = m_digging_anim;