Add a little animation when changing the wielded item

[minetest.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index 642b8d2d041e197ed89baec5e0f05cff32c8749e..c8a6e0bb80092b1817baca3cf8d9d18d2b2c4f47 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -117,7 +117,7 @@ class Camera
        void setDigging(s32 button);
 
        // Replace the wielded item mesh
-       void wield(const ItemStack &item);
+       void wield(const ItemStack &item, u16 playeritem);
 
        // Draw the wielded tool.
        // This has to happen *after* the main scene is drawn.
@@ -166,6 +166,8 @@ class Camera
        s32 m_view_bobbing_state;
        // Speed of view bobbing animation
        f32 m_view_bobbing_speed;
+       // Fall view bobbing
+       f32 m_view_bobbing_fall;
 
        // Digging animation frame (0 <= m_digging_anim < 1)
        f32 m_digging_anim;
@@ -173,6 +175,15 @@ class Camera
        // If 0, left-click digging animation
        // If 1, right-click digging animation
        s32 m_digging_button;
+
+       //dummymesh for camera
+       irr::scene::IAnimatedMesh* m_dummymesh;
+
+       // Animation when changing wielded item
+       f32 m_wield_change_timer;
+       scene::IMesh *m_wield_mesh_next;
+       u16 m_previous_playeritem;
+       std::string m_previous_itemname;
 };
 
 #endif