Fix water-glass and water-lava surfaces

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

diff --git a/src/camera.h b/src/camera.h
index 026f928741c41011e4cbe1346bc7cb63aa3bfc9b..b6349d2c888f1dc9cb536f99d3cda47c8e17ecf2 100644 (file)
--- a/src/camera.h
+++ b/src/camera.h
@@ -24,6 +24,9 @@ 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;
@@ -63,12 +66,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
@@ -124,12 +121,19 @@ public:
        // 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
        scene::ISceneManager* m_smgr;
        scene::ISceneNode* m_playernode;
        scene::ISceneNode* m_headnode;
        scene::ICameraSceneNode* m_cameranode;
+
+       scene::ISceneManager* m_wieldmgr;
        ExtrudedSpriteSceneNode* m_wieldnode;
 
        // draw control
@@ -204,6 +208,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;
@@ -215,6 +221,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);