Commit 0ee0b06e authored by bitplane's avatar bitplane

Fix some initialization order warnings caused by reorganising members

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2274 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 7e783835
...@@ -44,7 +44,7 @@ namespace irr ...@@ -44,7 +44,7 @@ namespace irr
//! Constructor. //! Constructor.
IReferenceCounted() IReferenceCounted()
: ReferenceCounter(1), DebugName(0) : DebugName(0), ReferenceCounter(1)
{ {
} }
......
...@@ -153,10 +153,9 @@ namespace video ...@@ -153,10 +153,9 @@ namespace video
: MaterialType(EMT_SOLID), AmbientColor(255,255,255,255), DiffuseColor(255,255,255,255), : MaterialType(EMT_SOLID), AmbientColor(255,255,255,255), DiffuseColor(255,255,255,255),
EmissiveColor(0,0,0,0), SpecularColor(255,255,255,255), EmissiveColor(0,0,0,0), SpecularColor(255,255,255,255),
Shininess(0.0f), MaterialTypeParam(0.0f), MaterialTypeParam2(0.0f), Thickness(1.0f), Shininess(0.0f), MaterialTypeParam(0.0f), MaterialTypeParam2(0.0f), Thickness(1.0f),
Wireframe(false), PointCloud(false), GouraudShading(true), Lighting(true), ZBuffer(ECFN_LESSEQUAL), AntiAliasing(EAAM_SIMPLE|EAAM_LINE_SMOOTH), ColorMask(ECP_ALL),
ZWriteEnable(true), BackfaceCulling(true), FrontfaceCulling(false), Wireframe(false), PointCloud(false), GouraudShading(true), Lighting(true), ZWriteEnable(true),
FogEnable(false), NormalizeNormals(false), ZBuffer(ECFN_LESSEQUAL), BackfaceCulling(true), FrontfaceCulling(false), FogEnable(false), NormalizeNormals(false)
AntiAliasing(EAAM_SIMPLE|EAAM_LINE_SMOOTH), ColorMask(ECP_ALL)
{ } { }
//! Copy constructor //! Copy constructor
......
...@@ -16,7 +16,7 @@ namespace scene ...@@ -16,7 +16,7 @@ namespace scene
struct SSharedMeshBuffer : public IMeshBuffer struct SSharedMeshBuffer : public IMeshBuffer
{ {
//! constructor //! constructor
SSharedMeshBuffer() : IMeshBuffer(), ChangedID_Vertex(1), ChangedID_Index(1), Vertices(0), MappingHint(EHM_NEVER) SSharedMeshBuffer() : IMeshBuffer(), Vertices(0), ChangedID_Vertex(1), ChangedID_Index(1), MappingHint(EHM_NEVER)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("SSharedMeshBuffer"); setDebugName("SSharedMeshBuffer");
......
...@@ -19,9 +19,10 @@ namespace scene ...@@ -19,9 +19,10 @@ namespace scene
struct SSkinMeshBuffer : public IMeshBuffer struct SSkinMeshBuffer : public IMeshBuffer
{ {
//! Default constructor //! Default constructor
SSkinMeshBuffer(video::E_VERTEX_TYPE vt=video::EVT_STANDARD) : SSkinMeshBuffer(video::E_VERTEX_TYPE vt=video::EVT_STANDARD) :
ChangedID_Vertex(1),ChangedID_Index(1),MappingHint_Vertex(EHM_NEVER), ChangedID_Vertex(1), ChangedID_Index(1), VertexType(vt),
MappingHint_Index(EHM_NEVER),VertexType(vt),BoundingBoxNeedsRecalculated(true) MappingHint_Vertex(EHM_NEVER), MappingHint_Index(EHM_NEVER),
BoundingBoxNeedsRecalculated(true)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("SSkinMeshBuffer"); setDebugName("SSkinMeshBuffer");
......
...@@ -26,15 +26,15 @@ public: ...@@ -26,15 +26,15 @@ public:
//! Default constructor for empty array. //! Default constructor for empty array.
array() array()
: data(0), allocated(0), used(0), : data(0), allocated(0), used(0),
free_when_destroyed(true), is_sorted(true),strategy ( ALLOC_STRATEGY_DOUBLE ) strategy(ALLOC_STRATEGY_DOUBLE), free_when_destroyed(true), is_sorted(true)
{ {
} }
//! Constructs an array and allocates an initial chunk of memory. //! Constructs an array and allocates an initial chunk of memory.
/** \param start_count Amount of elements to pre-allocate. */ /** \param start_count Amount of elements to pre-allocate. */
array(u32 start_count) array(u32 start_count)
: data(0), allocated(0), used(0), : data(0), allocated(0), used(0),
free_when_destroyed(true), is_sorted(true),strategy ( ALLOC_STRATEGY_DOUBLE ) strategy(ALLOC_STRATEGY_DOUBLE), free_when_destroyed(true), is_sorted(true)
{ {
reallocate(start_count); reallocate(start_count);
} }
...@@ -115,7 +115,7 @@ public: ...@@ -115,7 +115,7 @@ public:
T e(element); T e(element);
//reallocate(used * 2 +1); // increase data block //reallocate(used * 2 +1); // increase data block
// TA: okt, 2008. it's only allowed to alloc one element, if // TA: okt, 2008. it's only allowed to alloc one element, if
// default constructor has to be called // default constructor has to be called
// increase data block // increase data block
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment