Add '/clearobjects quick'

[minetest.git] / src / mapblock_mesh.h

diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index 283006331228fd5d3e0c4140ea17ac87d285b3fe..421e8f2b39d2960c86cfa685b2849e2b7100da68 100644 (file)
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -41,10 +41,8 @@ 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;
        bool m_use_shaders;
@@ -67,11 +65,6 @@ 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
        */
@@ -104,14 +97,16 @@ class MapBlockMesh
        // Returns true if anything has been changed.
        bool animate(bool faraway, float time, int crack, u32 daynight_ratio);
 
-       scene::SMesh* getMesh()
+       scene::IMesh *getMesh()
        {
                return m_mesh;
        }
 
-       MinimapMapblock* getMinimapMapblock()
+       MinimapMapblock *moveMinimapMapblock()
        {
-               return m_minimap_mapblock;
+               MinimapMapblock *p = m_minimap_mapblock;
+               m_minimap_mapblock = NULL;
+               return p;
        }
 
        bool isAnimationForced() const
@@ -128,17 +123,14 @@ class MapBlockMesh
        void updateCameraOffset(v3s16 camera_offset);
 
 private:
-       scene::SMesh *m_mesh;
+       scene::IMesh *m_mesh;
        MinimapMapblock *m_minimap_mapblock;
        IGameDef *m_gamedef;
        ITextureSource *m_tsrc;
        IShaderSource *m_shdrsrc;
 
        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;
@@ -148,7 +140,6 @@ 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
@@ -175,7 +166,7 @@ struct PreMeshBuffer
 {
        TileSpec tile;
        std::vector<u16> indices;
-       std::vector<video::S3DVertexTangents> vertices;
+       std::vector<video::S3DVertex> vertices;
 };
 
 struct MeshCollector