summaryrefslogtreecommitdiff
path: root/src/clientmap.h
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-06-16 11:25:52 +0200
committerGitHub <noreply@github.com>2017-06-16 11:25:52 +0200
commit76be103a91d6987527af19e87d93007be8ba8a67 (patch)
treec83c21e7c0adc37251f77788023eb3c242a751ca /src/clientmap.h
parent49d6e5f4ab79078d1608c22a9cce286b3cf86eb9 (diff)
downloadminetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.gz
minetest-76be103a91d6987527af19e87d93007be8ba8a67.tar.bz2
minetest-76be103a91d6987527af19e87d93007be8ba8a67.zip
C++11 patchset 9: move hardcoded init parameters to class definitions (part 1) (#5984)
* C++11 patchset 9: move hardcoded init parameters to class definitions C++11 introduced the possibility to define the default values directly in class definitions, do it on current code Also remove some unused attributes * CollisionInfo::bouncy * collisionMoveResult::collides_xy * collisionMoveResult::standing_on_unloaded * Clouds::speed * More constructor cleanups + some variables removal * remove only write guiFormSpecMenu::m_old_tooltip * move header included inside defintions in genericobject.h * remove some unused since years exception classes * remove unused & empty debug_stacks_init * remove unused & empty content_nodemeta_serialize_legacy * remove forgotten useless bool (bouncy) in collision.cpp code
Diffstat (limited to 'src/clientmap.h')
-rw-r--r--src/clientmap.h31
1 files changed, 11 insertions, 20 deletions
diff --git a/src/clientmap.h b/src/clientmap.h
index 84228f4ca..8d2720771 100644
--- 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(0),
- wanted_max_blocks(0),
- show_wireframe(false),
- 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;
+ u32 wanted_max_blocks = 0;
// show a wire frame for debugging
- bool show_wireframe;
+ 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;
@@ -137,13 +127,14 @@ public:
private:
Client *m_client;
- aabb3f 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;
std::map<v3s16, MapBlock*> m_drawlist;