summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-09-26 16:10:54 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-09-26 16:10:54 +0300
commit9a7471b74085973a19c192737f3dbcfe43926b52 (patch)
tree0d84cc63702b171d4f4cc77154523f3cd320ca34
parent061d4b420206c67fb346d75fb6bcaf4aa8147ca8 (diff)
downloadminetest-9a7471b74085973a19c192737f3dbcfe43926b52.tar.gz
minetest-9a7471b74085973a19c192737f3dbcfe43926b52.tar.bz2
minetest-9a7471b74085973a19c192737f3dbcfe43926b52.zip
Rotate wielded tool the right way and modify axe graphics accordingly
-rw-r--r--data/tool_steelaxe.pngbin209 -> 927 bytes
-rw-r--r--data/tool_stoneaxe.pngbin193 -> 931 bytes
-rw-r--r--data/tool_woodaxe.pngbin190 -> 927 bytes
-rw-r--r--src/camera.cpp4
4 files changed, 2 insertions, 2 deletions
diff --git a/data/tool_steelaxe.png b/data/tool_steelaxe.png
index 390dbb087..0ad23c93b 100644
--- a/data/tool_steelaxe.png
+++ b/data/tool_steelaxe.png
Binary files differ
diff --git a/data/tool_stoneaxe.png b/data/tool_stoneaxe.png
index 0c5414af5..698ac918f 100644
--- a/data/tool_stoneaxe.png
+++ b/data/tool_stoneaxe.png
Binary files differ
diff --git a/data/tool_woodaxe.png b/data/tool_woodaxe.png
index 34f54eff9..3daa4af72 100644
--- a/data/tool_woodaxe.png
+++ b/data/tool_woodaxe.png
Binary files differ
diff --git a/src/camera.cpp b/src/camera.cpp
index 1a5330497..34226b90b 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;