c55sound continued

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

diff --git a/src/camera.h b/src/camera.h
index 66825e372a58646ad28b44a56b7f5ee88b6e3962..0180d99e272ea1256d8483e0b49ad36c23bfdc80 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -22,12 +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
@@ -37,7 +39,8 @@ class ExtrudedSpriteSceneNode;
 class Camera
 {
 public:
-       Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control);
+       Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
+                       IGameDef *gamedef);
        ~Camera();
 
        // Get player scene node.
@@ -103,21 +106,19 @@ public:
 
        // 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();
-
-       // Replace the wielded item mesh
-       void wield(const InventoryItem* item);
-
        // Start digging animation
        // Pass 0 for left click, 1 for right click
        void setDigging(s32 button);
 
+       // Replace the wielded item mesh
+       void wield(const ItemStack &item);
+
        // Draw the wielded tool.
        // This has to happen *after* the main scene is drawn.
        // Warning: This clears the Z buffer.
@@ -131,15 +132,13 @@ private:
        scene::ICameraSceneNode* m_cameranode;
 
        scene::ISceneManager* m_wieldmgr;
-       ExtrudedSpriteSceneNode* m_wieldnode;
+       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;
+       
+       IGameDef *m_gamedef;
 
        // Absolute camera position
        v3f m_camera_position;
@@ -152,7 +151,6 @@ private:
        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;
@@ -177,54 +175,4 @@ private:
        s32 m_digging_button;
 };
 
-
-/*
-       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(1,1,1));
-       ~ExtrudedSpriteSceneNode();
-
-       void setSprite(video::ITexture* texture);
-       void setCube(const TileSpec tiles[6]);
-
-       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;
-       virtual void OnRegisterSceneNode();
-       virtual void render();
-
-private:
-       scene::IMeshSceneNode* m_meshnode;
-       f32 m_thickness;
-       scene::IMesh* m_cubemesh;
-       bool m_is_cube;
-       u8 m_light;
-
-       // 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();
-};
-
 #endif