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

Cpp11 initializers: last src root changeset (#6022)

Browse source 
* Cpp11 initializers: last src root changeset

Finish to migrate all src root folder files to C++11 constructor initializers
This commit is contained in:
Loïc Blot 2017-06-21 11:51:29 +02:00 • committed by GitHub
parent 12aad731ad
commit 1425c6def1
20 changed files with 127 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/voxel.h
View file

@ -60,11 +60,8 @@ class VoxelArea
{
public:
// Starts as zero sized
VoxelArea():
MinEdge(1,1,1),
MaxEdge(0,0,0)
{
}
VoxelArea() {}
VoxelArea(v3s16 min_edge, v3s16 max_edge):
MinEdge(min_edge),
MaxEdge(max_edge)
@ -325,22 +322,22 @@ public:
}
// Edges are inclusive
v3s16 MinEdge;
v3s16 MinEdge = v3s16(1,1,1);
v3s16 MaxEdge;
};
// unused
#define VOXELFLAG_UNUSED (1<<0)
// unused
#define VOXELFLAG_UNUSED (1 << 0)
// no data about that node
#define VOXELFLAG_NO_DATA (1<<1)
#define VOXELFLAG_NO_DATA (1 << 1)
// Algorithm-dependent
#define VOXELFLAG_CHECKED1 (1<<2)
#define VOXELFLAG_CHECKED1 (1 << 2)
// Algorithm-dependent
#define VOXELFLAG_CHECKED2 (1<<3)
#define VOXELFLAG_CHECKED2 (1 << 3)
// Algorithm-dependent
#define VOXELFLAG_CHECKED3 (1<<4)
#define VOXELFLAG_CHECKED3 (1 << 4)
// Algorithm-dependent
#define VOXELFLAG_CHECKED4 (1<<5)
#define VOXELFLAG_CHECKED4 (1 << 5)
enum VoxelPrintMode
{
@ -570,29 +567,17 @@ public:
VoxelArea m_area;
/*
NULL if data size is 0 (extent (0,0,0))
nullptr if data size is 0 (extent (0,0,0))
Data is stored as [z*h*w + y*h + x]
*/
MapNode *m_data;
MapNode *m_data = nullptr;
/*
Flags of all nodes
*/
u8 *m_flags;
u8 *m_flags = nullptr;
static const MapNode ContentIgnoreNode;
//TODO: Use these or remove them
//TODO: Would these make any speed improvement?
//bool m_pressure_route_valid;
//v3s16 m_pressure_route_surface;
/*
Some settings
*/
//bool m_disable_water_climb;
private:
};
#endif