From b204bc4da91f6f0bf38cc284693450afc5787512 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Thu, 17 Aug 2017 08:26:52 +0200 Subject: clientmap, clientmedia: code modernization * use range-based for loops * simplify some tests * various code style fixes * remove debugprint in ClientMap::getBackgroundBrightness, debug code was not intended to be there * remove unused fields in MapDrawControl * use emplace_back instead of push_back when necessary --- src/clientmap.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/clientmap.h') diff --git a/src/clientmap.h b/src/clientmap.h index a0f16e46a..761d124e7 100644 --- a/src/clientmap.h +++ b/src/clientmap.h @@ -36,12 +36,6 @@ struct MapDrawControl 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 = 0; - // Number of blocks that would have been drawn in wanted_range - u32 blocks_would_have_drawn = 0; - // Distance to the farthest block drawn - float farthest_drawn = 0; }; class Client; @@ -62,7 +56,7 @@ public: s32 id ); - ~ClientMap(); + virtual ~ClientMap() = default; s32 mapType() const { @@ -74,7 +68,7 @@ public: ISceneNode::drop(); } - void updateCamera(v3f pos, v3f dir, f32 fov, v3s16 offset) + void updateCamera(const v3f &pos, const v3f &dir, f32 fov, const v3s16 &offset) { m_camera_position = pos; m_camera_direction = dir; @@ -109,7 +103,7 @@ public: void getBlocksInViewRange(v3s16 cam_pos_nodes, v3s16 *p_blocks_min, v3s16 *p_blocks_max); - void updateDrawList(video::IVideoDriver* driver); + void updateDrawList(); void renderMap(video::IVideoDriver* driver, s32 pass); int getBackgroundBrightness(float max_d, u32 daylight_factor, @@ -130,7 +124,7 @@ private: MapDrawControl &m_control; - v3f m_camera_position; + v3f m_camera_position = v3f(0,0,0); v3f m_camera_direction = v3f(0,0,1); f32 m_camera_fov = M_PI; v3s16 m_camera_offset; -- cgit v1.2.3