Simplify player modification checks

[minetest.git] / src / mapblock_mesh.h

diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index 021309d9931798442332a6aa56dd814d71dd85f0..c5295499884d63c39d13080f85bf972c1488cb7b 100644 (file)
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -39,7 +39,11 @@ struct MeshMakeData
        VoxelManipulator m_vmanip;
        v3s16 m_blockpos;
        v3s16 m_crack_pos_relative;
+       v3s16 m_highlighted_pos_relative;
        bool m_smooth_lighting;
+       bool m_show_hud;
+       video::SColor m_highlight_mesh_color;
+
        IGameDef *m_gamedef;
 
        MeshMakeData(IGameDef *gamedef);
@@ -60,6 +64,11 @@ struct MeshMakeData
        */
        void setCrack(int crack_level, v3s16 crack_pos);
 
+       /*
+               Set the highlighted node position
+       */
+
+       void setHighlighted(v3s16 highlighted_pos, bool show_hud);
        /*
                Enable or disable smooth lighting
        */
@@ -114,6 +123,11 @@ class MapBlockMesh
        scene::SMesh *m_mesh;
        IGameDef *m_gamedef;
 
+       bool m_enable_shaders;
+       bool m_enable_highlighting;
+
+       video::SColor m_highlight_mesh_color;
+       
        // Must animate() be called before rendering?
        bool m_has_animation;
        int m_animation_force_timer;
@@ -123,6 +137,7 @@ class MapBlockMesh
        int m_last_crack;
        // Maps mesh buffer (i.e. material) indices to base texture names
        std::map<u32, std::string> m_crack_materials;
+       std::list<u32> m_highlighted_materials;
 
        // Animation info: texture animationi
        // Maps meshbuffers to TileSpecs
@@ -172,8 +187,8 @@ inline video::SColor MapBlock_LightColor(u8 alpha, u16 light, u8 light_source=0)
 }
 
 // Compute light at node
-u16 getInteriorLight(MapNode n, s32 increment, MeshMakeData *data);
-u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, MeshMakeData *data);
+u16 getInteriorLight(MapNode n, s32 increment, INodeDefManager *ndef);
+u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, INodeDefManager *ndef);
 u16 getSmoothLight(v3s16 p, v3s16 corner, MeshMakeData *data);
 
 // Retrieves the TileSpec of a face of a node