oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

clientmap, clientmedia: code modernization

Browse source 
* 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
This commit is contained in:
Loic Blot 2017-08-17 08:26:52 +02:00
parent 3e80bf933f
commit b204bc4da9
No known key found for this signature in database
GPG key ID: EFAA458E8C153987
5 changed files with 69 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/clientmap.h
View file

@ -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;