Rotate wielded tool the right way and modify axe graphics accordingly

diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png
index 390dbb0870e77abfbd49e2a99eca89518cd57f4d..0ad23c93b70fb8f88a4b9b6d024566af443a17a2 100644 (file)
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 0c5414af570340c9d9454ff53f8afc6f2c4c5cce..698ac918fdbeb8dd86515fe65360b9d53077aaa7 100644 (file)
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 34f54eff966ad5dc9398a1b45fbec8d403022eed..3daa4af72bb200b80ad57b1ee801d21ee1115c71 100644 (file)
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 1a53304970b295885bdf7334451618dc8d91e78a..34226b90bdbc73dec889594b266574dfde723282 100644 (file)
--- 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;