diff options
Diffstat (limited to 'src/clientmap.h')
| -rw-r--r-- | src/clientmap.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/clientmap.h b/src/clientmap.h index 492e23fa5..396e68f64 100644 --- a/src/clientmap.h +++ b/src/clientmap.h @@ -30,9 +30,8 @@ struct MapDrawControl { MapDrawControl(): range_all(false), - wanted_range(50), + wanted_range(0), wanted_max_blocks(0), - wanted_min_range(0), blocks_drawn(0), blocks_would_have_drawn(0), farthest_drawn(0) @@ -44,8 +43,6 @@ struct MapDrawControl float wanted_range; // 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; // Number of blocks rendered is written here by the renderer u32 blocks_drawn; // Number of blocks that would have been drawn in wanted_range @@ -89,7 +86,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; @@ -116,11 +112,13 @@ public: 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); @@ -141,7 +139,7 @@ public: private: Client *m_client; - core::aabbox3d<f32> m_box; + aabb3f m_box; MapDrawControl &m_control; @@ -149,7 +147,6 @@ private: v3f m_camera_direction; f32 m_camera_fov; v3s16 m_camera_offset; - JMutex m_camera_mutex; std::map<v3s16, MapBlock*> m_drawlist; |