Merge pull request #1805 from Azaezel/startRightEndRight

clang: constructor initialization order
This commit is contained in:
Areloch 2016-10-19 08:39:12 -05:00 committed by GitHub
commit 6cc7bcd2e0
64 changed files with 260 additions and 255 deletions

View file

@ -317,7 +317,7 @@ public:
//------------------------------------------------------------------------------
ColladaAppMesh::ColladaAppMesh(const domInstance_geometry* instance, ColladaAppNode* node)
: instanceGeom(instance), instanceCtrl(0), appNode(node), geomExt(0)
: appNode(node),instanceGeom(instance), instanceCtrl(0), geomExt(0)
{
flags = 0;
numFrames = 0;
@ -325,7 +325,7 @@ ColladaAppMesh::ColladaAppMesh(const domInstance_geometry* instance, ColladaAppN
}
ColladaAppMesh::ColladaAppMesh(const domInstance_controller* instance, ColladaAppNode* node)
: instanceGeom(0), instanceCtrl(instance), appNode(node), geomExt(0)
: appNode(node),instanceGeom(0), instanceCtrl(instance), geomExt(0)
{
flags = 0;
numFrames = 0;

View file

@ -57,9 +57,12 @@ static char* TrimFirstWord(char* str)
}
ColladaAppNode::ColladaAppNode(const domNode* node, ColladaAppNode* parent)
: p_domNode(node), appParent(parent), nodeExt(new ColladaExtension_node(node)),
lastTransformTime(TSShapeLoader::DefaultTime-1), defaultTransformValid(false),
invertMeshes(false)
: p_domNode(node), appParent(parent),
nodeExt(new ColladaExtension_node(node)),
invertMeshes(false),
lastTransformTime(TSShapeLoader::DefaultTime-1),
defaultTransformValid(false)
{
mName = dStrdup(_GetNameOrId(node));
mParentName = dStrdup(parent ? parent->getName() : "ROOT");

View file

@ -26,7 +26,7 @@
Vector<AppMaterial*> AppMesh::appMaterials;
AppMesh::AppMesh()
: flags(0), numFrames(0), numMatFrames(0), vertsPerFrame(0)
: flags(0), vertsPerFrame(0),numFrames(0), numMatFrames(0)
{
}

View file

@ -32,8 +32,8 @@ TSRenderState::TSRenderState()
mNoRenderNonTranslucent( false ),
mMaterialHint( NULL ),
mCuller( NULL ),
mLightQuery( NULL ),
mUseOriginSort( false ),
mLightQuery( NULL ),
mAccuTex( NULL ),
mNodeTransforms( NULL ),
mNodeTransformCount( 0 )