use unordered containers where possible (patch 4 on X)

[dragonfireclient.git] / src / mapblock_mesh.h

diff --git a/src/mapblock_mesh.h b/src/mapblock_mesh.h
index 9c4fb655a397928ce3349cad445ca3f2a7a8810e..8376468dafa9048be52581c46abe5735f190f3d5 100644 (file)
--- a/src/mapblock_mesh.h
+++ b/src/mapblock_mesh.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
 #include "voxel.h"
+#include "util/cpp11_container.h"
 #include <map>
 
 class IGameDef;
@@ -41,15 +42,15 @@ 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;
+       bool m_use_tangent_vertices;
 
-       MeshMakeData(IGameDef *gamedef, bool use_shaders);
+       MeshMakeData(IGameDef *gamedef, bool use_shaders,
+                       bool use_tangent_vertices = false);
 
        /*
                Copy central data directly from block, and other data from
@@ -67,11 +68,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
        */
@@ -126,21 +122,21 @@ class MapBlockMesh
                if(m_animation_force_timer > 0)
                        m_animation_force_timer--;
        }
-       
+
        void updateCameraOffset(v3s16 camera_offset);
 
 private:
        scene::IMesh *m_mesh;
        MinimapMapblock *m_minimap_mapblock;
        IGameDef *m_gamedef;
+       video::IVideoDriver *m_driver;
        ITextureSource *m_tsrc;
        IShaderSource *m_shdrsrc;
 
        bool m_enable_shaders;
-       bool m_enable_highlighting;
+       bool m_use_tangent_vertices;
+       bool m_enable_vbo;
 
-       video::SColor m_highlight_mesh_color;
-       
        // Must animate() be called before rendering?
        bool m_has_animation;
        int m_animation_force_timer;
@@ -149,21 +145,20 @@ class MapBlockMesh
        // Last crack value passed to animate()
        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;
+       UNORDERED_MAP<u32, std::string> m_crack_materials;
 
        // Animation info: texture animationi
        // Maps meshbuffers to TileSpecs
-       std::map<u32, TileSpec> m_animation_tiles;
-       std::map<u32, int> m_animation_frames; // last animation frame
-       std::map<u32, int> m_animation_frame_offsets;
-       
+       UNORDERED_MAP<u32, TileSpec> m_animation_tiles;
+       UNORDERED_MAP<u32, int> m_animation_frames; // last animation frame
+       UNORDERED_MAP<u32, int> m_animation_frame_offsets;
+
        // Animation info: day/night transitions
        // Last daynight_ratio value passed to animate()
        u32 m_last_daynight_ratio;
        // For each meshbuffer, maps vertex indices to (day,night) pairs
        std::map<u32, std::map<u32, std::pair<u8, u8> > > m_daynight_diffs;
-       
+
        // Camera offset info -> do we have to translate the mesh?
        v3s16 m_camera_offset;
 };
@@ -178,11 +173,19 @@ struct PreMeshBuffer
        TileSpec tile;
        std::vector<u16> indices;
        std::vector<video::S3DVertex> vertices;
+       std::vector<video::S3DVertexTangents> tangent_vertices;
 };
 
 struct MeshCollector
 {
        std::vector<PreMeshBuffer> prebuffers;
+       bool m_use_tangent_vertices;
+
+       MeshCollector(bool use_tangent_vertices):
+               m_use_tangent_vertices(use_tangent_vertices)
+       {
+       }
+
        void append(const TileSpec &material,
                        const video::S3DVertex *vertices, u32 numVertices,
                        const u16 *indices, u32 numIndices);