"or" -> "||" in content_mapblock.cpp

[dragonfireclient.git] / src / camera.h

diff --git a/src/camera.h b/src/camera.h
index 08c03dd19abefccc2a370242bb61dbbeade9b6b0..168863c3ec618af56693576c339c5af6de858d93 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -22,11 +22,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "mesh.h"
+#include "tile.h"
 #include "utility.h"
+#include <ICameraSceneNode.h>
 
 class LocalPlayer;
-class MapDrawControl;
-class ExtrudedSpriteSceneNode;
+struct MapDrawControl;
+class IGameDef;
 
 /*
        Client camera class, manages the player and camera scene nodes, the viewing distance
@@ -62,12 +65,6 @@ class Camera
                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
@@ -108,19 +105,23 @@ class Camera
 
        // Update the camera from the local player's position.
        // frametime is used to adjust the viewing range.
-       void update(LocalPlayer* player, f32 frametime, v2u32 screensize);
+       void update(LocalPlayer* player, f32 frametime, v2u32 screensize,
+                       f32 tool_reload_ratio);
 
        // Render distance feedback loop
        void updateViewingRange(f32 frametime_in);
 
-       // Update settings from g_settings
-       void updateSettings();
+       // Start digging animation
+       // Pass 0 for left click, 1 for right click
+       void setDigging(s32 button);
 
        // Replace the wielded item mesh
-       void wield(InventoryItem* item);
+       void wield(const ItemStack &item, IGameDef *gamedef);
 
-       // Start or stop digging animation
-       void setDigging(bool digging);
+       // 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
@@ -128,16 +129,14 @@ class Camera
        scene::ISceneNode* m_playernode;
        scene::ISceneNode* m_headnode;
        scene::ICameraSceneNode* m_cameranode;
-       ExtrudedSpriteSceneNode* m_wieldnode;
+
+       scene::ISceneManager* m_wieldmgr;
+       scene::IMeshSceneNode* m_wieldnode;
+       u8 m_wieldlight;
 
        // draw control
        MapDrawControl& m_draw_control;
 
-       // viewing_range_min_nodes setting
-       f32 m_viewing_range_min;
-       // viewing_range_max_nodes setting
-       f32 m_viewing_range_max;
-
        // Absolute camera position
        v3f m_camera_position;
        // Absolute camera direction
@@ -149,7 +148,6 @@ class Camera
        f32 m_fov_y;
 
        // Stuff for viewing range calculations
-       f32 m_wanted_frametime;
        f32 m_added_frametime;
        s16 m_added_frames;
        f32 m_range_old;
@@ -157,61 +155,21 @@ class Camera
        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.
        s32 m_view_bobbing_state;
        // Speed of view bobbing animation
        f32 m_view_bobbing_speed;
-};
-
-
-/*
-       A scene node that displays a 2D mesh extruded into the third dimension,
-       to add an illusion of depth.
-
-       Since this class was created to display the wielded tool of the local
-       player, and only tools and items are rendered like this (but not solid
-       content like stone and mud, which are shown as cubes), the option to
-       draw a textured cube instead is provided.
- */
-class ExtrudedSpriteSceneNode: public scene::ISceneNode
-{
-public:
-       ExtrudedSpriteSceneNode(
-               scene::ISceneNode* parent,
-               scene::ISceneManager* mgr,
-               s32 id = -1,
-               const v3f& position = v3f(0,0,0),
-               const v3f& rotation = v3f(0,0,0),
-               const v3f& scale = v3f(0,0,0));
-       ~ExtrudedSpriteSceneNode();
-
-       void setSprite(video::ITexture* texture);
-       void setCube(const TileSpec faces[6]);
 
-       f32 getSpriteThickness() const { return m_thickness; }
-       void setSpriteThickness(f32 thickness);
-
-       void removeSpriteFromCache(video::ITexture* texture);
-
-       virtual const core::aabbox3d<f32>& getBoundingBox() const;
-       virtual void OnRegisterSceneNode();
-       virtual void render();
-
-private:
-       scene::IMeshSceneNode* m_meshnode;
-       f32 m_thickness;
-       scene::IMesh* m_cubemesh;
-       bool m_is_cube;
-
-       // internal extrusion helper methods
-       io::path getExtrudedName(video::ITexture* texture);
-       scene::IAnimatedMesh* extrudeARGB(u32 width, u32 height, u8* data);
-       scene::IAnimatedMesh* extrude(video::ITexture* texture);
-       scene::IMesh* createCubeMesh();
+       // 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;
 };
 
 #endif