Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / mapblock_mesh.h

diff --git a/src/client/mapblock_mesh.h b/src/client/mapblock_mesh.h
index 95fda83e5b6766d176cb1ae2a2c58e537c36dcf0..6f454d34852c801609303f648e0c3dc58af8fa43 100644 (file)
--- a/src/client/mapblock_mesh.h
+++ b/src/client/mapblock_mesh.h
@@ -45,10 +45,8 @@ struct MeshMakeData
 
        Client *m_client;
        bool m_use_shaders;
-       bool m_use_tangent_vertices;
 
-       MeshMakeData(Client *client, bool use_shaders,
-                       bool use_tangent_vertices = false);
+       MeshMakeData(Client *client, bool use_shaders);
 
        /*
                Copy block data manually (to allow optimizations by the caller)
@@ -62,11 +60,6 @@ struct MeshMakeData
        */
        void fill(MapBlock *block);
 
-       /*
-               Set up with only a single node at (1,1,1)
-       */
-       void fillSingleNode(MapNode *node);
-
        /*
                Set the (node) position of a crack
        */
@@ -143,7 +136,6 @@ class MapBlockMesh
        IShaderSource *m_shdrsrc;
 
        bool m_enable_shaders;
-       bool m_use_tangent_vertices;
        bool m_enable_vbo;
 
        // Must animate() be called before rendering?
@@ -170,9 +162,6 @@ class MapBlockMesh
        // of sunlit vertices
        // Keys are pairs of (mesh index, buffer index in the mesh)
        std::map<std::pair<u8, u32>, std::map<u32, video::SColor > > m_daynight_diffs;
-
-       // Camera offset info -> do we have to translate the mesh?
-       v3s16 m_camera_offset;
 };
 
 /*!