LocalPlayer::accelerateHorizontal: cleanups

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

diff --git a/src/clientmap.h b/src/clientmap.h
index 492e23fa5e98d61c5066ffb831bc580090777c32..a0f16e46ada177dab6b039f0df14e38d5daae17f 100644 (file)
--- a/src/clientmap.h
+++ b/src/clientmap.h
@@ -28,30 +28,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct MapDrawControl
 {
-       MapDrawControl():
-               range_all(false),
-               wanted_range(50),
-               wanted_max_blocks(0),
-               wanted_min_range(0),
-               blocks_drawn(0),
-               blocks_would_have_drawn(0),
-               farthest_drawn(0)
-       {
-       }
        // Overrides limits by drawing everything
-       bool range_all;
+       bool range_all = false;
        // Wanted drawing range
-       float wanted_range;
+       float wanted_range = 0.0f;
        // Maximum number of blocks to draw
-       u32 wanted_max_blocks;
-       // Blocks in this range are drawn regardless of number of blocks drawn
-       float wanted_min_range;
+       u32 wanted_max_blocks = 0;
+       // show a wire frame for debugging
+       bool show_wireframe = false;
        // Number of blocks rendered is written here by the renderer
-       u32 blocks_drawn;
+       u32 blocks_drawn = 0;
        // Number of blocks that would have been drawn in wanted_range
-       u32 blocks_would_have_drawn;
+       u32 blocks_would_have_drawn = 0;
        // Distance to the farthest block drawn
-       float farthest_drawn;
+       float farthest_drawn = 0;
 };
 
 class Client;
@@ -59,7 +49,7 @@ class ITextureSource;
 
 /*
        ClientMap
-       
+
        This is the only map class that is able to render itself on screen.
 */
 
@@ -68,10 +58,7 @@ class ClientMap : public Map, public scene::ISceneNode
 public:
        ClientMap(
                        Client *client,
-                       IGameDef *gamedef,
                        MapDrawControl &control,
-                       scene::ISceneNode* parent,
-                       scene::ISceneManager* mgr,
                        s32 id
        );
 
@@ -89,7 +76,6 @@ public:
 
        void updateCamera(v3f pos, v3f dir, f32 fov, v3s16 offset)
        {
-               JMutexAutoLock lock(m_camera_mutex);
                m_camera_position = pos;
                m_camera_direction = dir;
                m_camera_fov = fov;
@@ -115,12 +101,14 @@ public:
                driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
                renderMap(driver, SceneManager->getSceneNodeRenderPass());
        }
-       
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
+
+       virtual const aabb3f &getBoundingBox() const
        {
                return m_box;
        }
-       
+
+       void getBlocksInViewRange(v3s16 cam_pos_nodes,
+               v3s16 *p_blocks_min, v3s16 *p_blocks_max);
        void updateDrawList(video::IVideoDriver* driver);
        void renderMap(video::IVideoDriver* driver, s32 pass);
 
@@ -131,28 +119,24 @@ public:
 
        // For debug printing
        virtual void PrintInfo(std::ostream &out);
-       
-       // Check if sector was drawn on last render()
-       bool sectorWasDrawn(v2s16 p)
-       {
-               return (m_last_drawn_sectors.find(p) != m_last_drawn_sectors.end());
-       }
-       
+
+       const MapDrawControl & getControl() const { return m_control; }
+       f32 getCameraFov() const { return m_camera_fov; }
 private:
        Client *m_client;
-       
-       core::aabbox3d<f32> m_box;
-       
+
+       aabb3f m_box = aabb3f(-BS * 1000000, -BS * 1000000, -BS * 1000000,
+               BS * 1000000, BS * 1000000, BS * 1000000);
+
        MapDrawControl &m_control;
 
        v3f m_camera_position;
-       v3f m_camera_direction;
-       f32 m_camera_fov;
+       v3f m_camera_direction = v3f(0,0,1);
+       f32 m_camera_fov = M_PI;
        v3s16 m_camera_offset;
-       JMutex m_camera_mutex;
 
        std::map<v3s16, MapBlock*> m_drawlist;
-       
+
        std::set<v2s16> m_last_drawn_sectors;
 
        bool m_cache_trilinear_filter;