Digging animation

diff --git a/src/camera.cpp b/src/camera.cpp
index 7f5931bddae10ed16091d99f09503f2f019dc629..a1830fcfcc1f8df0088283e2b8c8afce9e4655de 100644 (file)
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -26,13 +26,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "tile.h"
 #include <cmath>
 
-const s32 BOBFRAMES = 0x1000000; // must be a power of two
-
 Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
        m_smgr(smgr),
        m_playernode(NULL),
        m_headnode(NULL),
        m_cameranode(NULL),
+       m_wieldnode(NULL),
        m_draw_control(draw_control),
        m_viewing_range_min(5.0),
        m_viewing_range_max(5.0),
@@ -57,7 +56,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
        m_view_bobbing_speed(0),
 
        m_digging_anim(0),
-       m_digging_speed(0)
+       m_digging_button(-1)
 {
        //dstream<<__FUNCTION_NAME<<std::endl;
 
@@ -67,7 +66,7 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control):
        m_headnode = smgr->addEmptySceneNode(m_playernode);
        m_cameranode = smgr->addCameraSceneNode(smgr->getRootSceneNode());
        m_cameranode->bindTargetAndRotation(true);
-       m_wieldnode = new ExtrudedSpriteSceneNode(m_headnode, smgr, -1, v3f(1.3, -1, 2), v3f(-20, -100, 20), v3f(1));
+       m_wieldnode = new ExtrudedSpriteSceneNode(m_headnode, smgr);
 
        updateSettings();
 }
@@ -93,24 +92,54 @@ bool Camera::successfullyCreated(std::wstring& error_message)
                error_message = L"Failed to create the camera scene node";
                return false;
        }
+       if (m_wieldnode == NULL)
+       {
+               error_message = L"Failed to create the wielded item scene node";
+               return false;
+       }
        return true;
 }
 
+// Returns the fractional part of x
+inline f32 my_modf(f32 x)
+{
+       double dummy;
+       return modf(x, &dummy);
+}
+
 void Camera::step(f32 dtime)
 {
        if (m_view_bobbing_state != 0)
        {
-               s32 offset = MYMAX(dtime * m_view_bobbing_speed * 0.035 * BOBFRAMES, 1);
+               f32 offset = dtime * m_view_bobbing_speed * 0.035;
                if (m_view_bobbing_state == 2)
                {
                        // Animation is getting turned off
-                       s32 subanim = (m_view_bobbing_anim & (BOBFRAMES/2-1));
-                       if (subanim < BOBFRAMES/4)
-                               offset = -1 *  MYMIN(offset, subanim);
+                       if (m_view_bobbing_anim < 0.5)
+                               m_view_bobbing_anim -= offset;
                        else
-                               offset = MYMIN(offset, BOBFRAMES/2 - subanim);
+                               m_view_bobbing_anim += offset;
+                       if (m_view_bobbing_anim <= 0 || m_view_bobbing_anim >= 1)
+                       {
+                               m_view_bobbing_anim = 0;
+                               m_view_bobbing_state = 0;
+                       }
+               }
+               else
+               {
+                       m_view_bobbing_anim = my_modf(m_view_bobbing_anim + offset);
+               }
+       }
+
+       if (m_digging_button != -1)
+       {
+               f32 offset = dtime * 3.5;
+               m_digging_anim += offset;
+               if (m_digging_anim >= 1)
+               {
+                       m_digging_anim = 0;
+                       m_digging_button = -1;
                }
-               m_view_bobbing_anim = (m_view_bobbing_anim + offset) & (BOBFRAMES-1);
        }
 }
 
@@ -132,11 +161,10 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
        v3f rel_cam_target = v3f(0,0,1);
        v3f rel_cam_up = v3f(0,1,0);
 
-       s32 bobframe = m_view_bobbing_anim & (BOBFRAMES/2-1);
-       if (bobframe != 0)
+       if (m_view_bobbing_anim != 0)
        {
-               f32 bobfrac = (f32) bobframe / (BOBFRAMES/2);
-               f32 bobdir = (m_view_bobbing_anim < (BOBFRAMES/2)) ? 1.0 : -1.0;
+               f32 bobfrac = my_modf(m_view_bobbing_anim * 2);
+               f32 bobdir = (m_view_bobbing_anim < 0.5) ? 1.0 : -1.0;
 
                #if 1
                f32 bobknob = 1.2;
@@ -188,6 +216,27 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
        // Some more allowance that m_viewing_range_max * BS because of active objects etc.
        m_cameranode->setFarValue(m_viewing_range_max * BS * 10);
 
+       // Position the wielded item
+       v3f wield_position = v3f(1.3, -1.1, 2);
+       v3f wield_rotation = v3f(90, -90, -90);
+       if (m_digging_button != -1)
+       {
+               f32 digfrac = m_digging_anim;
+               wield_position.X -= sin(pow(digfrac, 0.8) * PI);
+               wield_position.Y += 0.5 * sin(digfrac * 2 * PI);
+               wield_position.Z += 0.2 * digfrac;
+
+               // Euler angles are PURE EVIL, so why not use quaternions?
+               core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
+               core::quaternion quat_end(v3f(90, 20, -130) * core::DEGTORAD);
+               core::quaternion quat_slerp;
+               quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * PI));
+               quat_slerp.toEuler(wield_rotation);
+               wield_rotation *= core::RADTODEG;
+       }
+       m_wieldnode->setPosition(wield_position);
+       m_wieldnode->setRotation(wield_rotation);
+
        // Render distance feedback loop
        updateViewingRange(frametime);
 
@@ -208,12 +257,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
        {
                // Stop animation
                m_view_bobbing_state = 2;
-               m_view_bobbing_speed = 100;
-       }
-       else if (m_view_bobbing_state == 2 && bobframe == 0)
-       {
-               // Stop animation completed
-               m_view_bobbing_state = 0;
+               m_view_bobbing_speed = 60;
        }
 }
 
@@ -378,14 +422,14 @@ void Camera::wield(const InventoryItem* item)
        else
        {
                // Bare hands
-               dstream << "bare hands" << std::endl;
                m_wieldnode->setVisible(false);
        }
 }
 
-void Camera::setDigging(bool digging)
+void Camera::setDigging(s32 button)
 {
-       // TODO
+       if (m_digging_button == -1)
+               m_digging_button = button;
 }
 
 

diff --git a/src/camera.h b/src/camera.h
index f960e748e1e1a7283f62cb3b22a822a5935790ff..026f928741c41011e4cbe1346bc7cb63aa3bfc9b 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -120,8 +120,9 @@ public:
        // Replace the wielded item mesh
        void wield(const InventoryItem* item);
 
-       // Start or stop digging animation
-       void setDigging(bool digging);
+       // Start digging animation
+       // Pass 0 for left click, 1 for right click
+       void setDigging(s32 button);
 
 private:
        // Scene manager and nodes
@@ -158,8 +159,8 @@ private:
        f32 m_frametime_counter;
        f32 m_time_per_range;
 
-       // View bobbing animation frame (0 <= m_view_bobbing < 0x1000000)
-       s32 m_view_bobbing_anim;
+       // View bobbing animation frame (0 <= m_view_bobbing_anim < 1)
+       f32 m_view_bobbing_anim;
        // If 0, view bobbing is off (e.g. player is standing).
        // If 1, view bobbing is on (player is walking).
        // If 2, view bobbing is getting switched off.
@@ -167,10 +168,12 @@ private:
        // Speed of view bobbing animation
        f32 m_view_bobbing_speed;
 
-       // Digging animation
-       s32 m_digging_anim;
-       // Speed of digging animation
-       s32 m_digging_speed;
+       // Digging animation frame (0 <= m_digging_anim < 1)
+       f32 m_digging_anim;
+       // If -1, no digging animation
+       // If 0, left-click digging animation
+       // If 1, right-click digging animation
+       s32 m_digging_button;
 };
 
 

diff --git a/src/game.cpp b/src/game.cpp
index 5e8db9b1d1d0b1b6e75ca6c2a2f9d83cad6cccd6..08bc6f176e58f57bfa8debfb80a8ce9d1d43d617 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1514,7 +1514,6 @@ void the_game(
                                std::cout<<DTIME<<"Left-clicked object"<<std::endl;
                                client.clickObject(0, selected_object->getBlock()->getPos(),
                                                selected_object->getId(), g_selected_item);
-                               camera.setDigging(true);
                        }
                        else if(input->getRightClicked())
                        {
@@ -1582,7 +1581,6 @@ void the_game(
                                std::cout<<DTIME<<"Left-clicked object"<<std::endl;
                                client.clickActiveObject(0,
                                                selected_active_object->getId(), g_selected_item);
-                               camera.setDigging(true);
                        }
                        else if(input->getRightClicked())
                        {
@@ -1757,7 +1755,7 @@ void the_game(
 
                                        dig_time += dtime;
 
-                                       camera.setDigging(true);
+                                       camera.setDigging(0);  // left click animation
                                }
                        }
                        
@@ -1820,6 +1818,7 @@ void the_game(
                                else
                                {
                                        client.groundAction(1, nodepos, neighbourpos, g_selected_item);
+                                       camera.setDigging(1);  // right click animation
                                }
                        }
                        
@@ -1828,6 +1827,11 @@ void the_game(
 
                } // selected_object == NULL
                
+               if(input->getLeftClicked())
+               {
+                       camera.setDigging(0); // left click animation
+               }
+
                input->resetLeftClicked();
                input->resetRightClicked();
                
@@ -1836,7 +1840,6 @@ void the_game(
                        std::cout<<DTIME<<"Left button released (stopped digging)"
                                        <<std::endl;
                        client.groundAction(2, v3s16(0,0,0), v3s16(0,0,0), 0);
-                       camera.setDigging(false);
                }
                if(input->getRightReleased())
                {