ToolDefManager serialization

[oweals/minetest.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index f960e748e1e1a7283f62cb3b22a822a5935790ff..8321a1f0dd7b16c70bee0a7107a98ccc025315a0 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -24,10 +24,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "tile.h"
 #include "utility.h"
+#include <ICameraSceneNode.h>
+#include <IMeshCache.h>
+#include <IAnimatedMesh.h>
 
 class LocalPlayer;
 class MapDrawControl;
 class ExtrudedSpriteSceneNode;
+class IGameDef;
 
 /*
        Client camera class, manages the player and camera scene nodes, the viewing distance
@@ -63,12 +67,6 @@ public:
                return m_cameranode;
        }
 
-       // Get wielded item scene node.
-       inline ExtrudedSpriteSceneNode* getWieldNode() const
-       {
-               return m_wieldnode;
-       }
-
        // Get the camera position (in absolute scene coordinates).
        // This has view bobbing applied.
        inline v3f getPosition() const
@@ -118,10 +116,16 @@ public:
        void updateSettings();
 
        // Replace the wielded item mesh
-       void wield(const InventoryItem* item);
+       void wield(const InventoryItem* item, IGameDef *gamedef);
 
-       // 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);
+
+       // Draw the wielded tool.
+       // This has to happen *after* the main scene is drawn.
+       // Warning: This clears the Z buffer.
+       void drawWieldedTool();
 
 private:
        // Scene manager and nodes
@@ -129,6 +133,8 @@ private:
        scene::ISceneNode* m_playernode;
        scene::ISceneNode* m_headnode;
        scene::ICameraSceneNode* m_cameranode;
+
+       scene::ISceneManager* m_wieldmgr;
        ExtrudedSpriteSceneNode* m_wieldnode;
 
        // draw control
@@ -158,8 +164,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 +173,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;
 };
 
 
@@ -201,6 +209,8 @@ public:
        f32 getSpriteThickness() const { return m_thickness; }
        void setSpriteThickness(f32 thickness);
 
+       void updateLight(u8 light);
+
        void removeSpriteFromCache(video::ITexture* texture);
 
        virtual const core::aabbox3d<f32>& getBoundingBox() const;
@@ -212,6 +222,7 @@ private:
        f32 m_thickness;
        scene::IMesh* m_cubemesh;
        bool m_is_cube;
+       u8 m_light;
 
        // internal extrusion helper methods
        io::path getExtrudedName(video::ITexture* texture);