Merge pull request #1984 from FooBarbarians/fix-1912

Reordering initialization methods #1912

Engine/source/scene/culling/sceneCullingState.cpp

@@ -49,8 +49,8 @@ F32 SceneCullingState::smOccluderMinHeightPercentage = 0.1f;
 SceneCullingState::SceneCullingState( SceneManager* sceneManager, const SceneCameraState& viewState )
    : mSceneManager( sceneManager ),
      mCameraState( viewState ),
-     mDisableZoneCulling( smDisableZoneCulling ),
-     mDisableTerrainOcclusion( smDisableTerrainOcclusion )
+     mDisableTerrainOcclusion( smDisableTerrainOcclusion ),
+     mDisableZoneCulling( smDisableZoneCulling )
 {
    AssertFatal( sceneManager->getZoneManager(), "SceneCullingState::SceneCullingState - SceneManager must have a zone manager!" );
 

Engine/source/scene/reflectionManager.cpp

@@ -83,8 +83,8 @@ U32 ReflectionManager::smFrameReflectionMS = 10;
 F32 ReflectionManager::smRefractTexScale = 0.5f;
 
 ReflectionManager::ReflectionManager() 
- : mUpdateRefract( true ),
-   mReflectFormat( GFXFormatR8G8B8A8 ),
+ : mReflectFormat( GFXFormatR8G8B8A8 ),
+   mUpdateRefract( true ),
    mLastUpdateMs( 0 )
 {
    mTimer = PlatformTimer::create();

Engine/source/scene/sceneRenderState.cpp

@@ -39,16 +39,16 @@ SceneRenderState::SceneRenderState( SceneManager* sceneManager,
                                     RenderPassManager* renderPass /* = NULL */,
                                     bool usePostEffects /* = true */ )
    :  mSceneManager( sceneManager ),
-      mCullingState( sceneManager, view ),
-      mRenderPass( renderPass ? renderPass : sceneManager->getDefaultRenderPass() ),
       mScenePassType( passType ),
-      mRenderNonLightmappedMeshes( true ),
-      mRenderLightmappedMeshes( true ),
+      mRenderPass( renderPass ? renderPass : sceneManager->getDefaultRenderPass() ),
+      mCullingState( sceneManager, view ),
       mUsePostEffects( usePostEffects ),
-      mDisableAdvancedLightingBins( false ),
+      mRenderLightmappedMeshes( true ),
+      mRenderNonLightmappedMeshes( true ),
       mRenderArea( view.getFrustum().getBounds() ),
-      mAmbientLightColor( sceneManager->getAmbientLightColor() ),
-      mSceneRenderStyle( SRS_Standard )
+      mDisableAdvancedLightingBins( false ),
+      mSceneRenderStyle( SRS_Standard ),
+      mAmbientLightColor( sceneManager->getAmbientLightColor() )
 {
    // Setup the default parameters for the screen metrics methods.
    mDiffuseCameraTransform = view.getHeadWorldViewMatrix();

Engine/source/scene/sceneTracker.cpp

@@ -30,8 +30,8 @@
 //-----------------------------------------------------------------------------
 
 SceneObjectLink::SceneObjectLink( SceneTracker* tracker, SceneObject* object )
-   : mTracker( tracker ),
-     mObject( object ),
+   : mObject( object ),
+     mTracker( tracker ),
      mNextLink( NULL ),
      mPrevLink( NULL )
 {

Engine/source/scene/zones/sceneZoneSpace.cpp

@@ -41,10 +41,10 @@ ClassChunker< SceneZoneSpace::ZoneSpaceRef > SceneZoneSpace::smZoneSpaceRefChunk
 
 SceneZoneSpace::SceneZoneSpace()
    : mManager( NULL ),
-     mZoneGroup( InvalidZoneGroup ),
      mZoneRangeStart( SceneZoneSpaceManager::InvalidZoneId ),
-     mZoneFlags( ZoneFlag_IsClosedOffSpace ),
+     mZoneGroup( InvalidZoneGroup ),
      mNumZones( 0 ),
+     mZoneFlags( ZoneFlag_IsClosedOffSpace ),
      mConnectedZoneSpaces( NULL )
 {
    VECTOR_SET_ASSOCIATION( mOccluders );

Engine/source/scene/zones/sceneZoneSpaceManager.cpp

@@ -44,8 +44,8 @@ ClassChunker< SceneObject::ZoneRef > SceneZoneSpaceManager::smZoneRefChunker;
 //-----------------------------------------------------------------------------
 
 SceneZoneSpaceManager::SceneZoneSpaceManager( SceneContainer* container )
-   : mContainer( container ),
-     mRootZone( new SceneRootZone() ),
+   : mRootZone( new SceneRootZone() ),
+     mContainer( container ),
      mNumTotalAllocatedZones( 0 ),
      mNumActiveZones( 0 ),
      mDirtyArea( Box3F::Invalid )