Merge pull request #1984 from FooBarbarians/fix-1912

Reordering initialization methods #1912
2026-02-12 19:31:41 +00:00 · 2017-04-26 01:11:51 -05:00 · 2017-04-26 01:11:51 -05:00 · 19dcfde60f
commit 19dcfde60f
parent ab51befa68 970dd5c477
70 changed files with 207 additions and 205 deletions
--- a/Engine/source/gui/containers/guiAutoScrollCtrl.cpp
+++ b/Engine/source/gui/containers/guiAutoScrollCtrl.cpp
@ -95,8 +95,8 @@ GuiAutoScrollCtrl::GuiAutoScrollCtrl()
     mStartDelay( 3.f ),
     mResetDelay( 5.f ),
     mChildBorder( 10 ),
-     mScrollSpeed( 1.f ),
-     mScrollOutOfSight( false )
+     mScrollOutOfSight( false ),
+     mScrollSpeed( 1.f )
 {
   mIsContainer = true;
 }
--- a/Engine/source/gui/containers/guiScrollCtrl.cpp
+++ b/Engine/source/gui/containers/guiScrollCtrl.cpp
@ -55,25 +55,25 @@ IMPLEMENT_CALLBACK( GuiScrollCtrl, onScroll, void, (), (),
 //-----------------------------------------------------------------------------

 GuiScrollCtrl::GuiScrollCtrl()
- : mChildMargin( 0, 0 ),
-   mBorderThickness( 1 ),
+ : mBorderThickness( 1 ),
+   mChildMargin( 0, 0 ),
   mScrollBarThickness( 16 ),
   mScrollBarArrowBtnLength( 16 ),
   mScrollBarDragTolerance( 130 ),
   mStateDepressed( false ),
   mHitRegion( None ),
-   mWillFirstRespond( true ),
-   mUseConstantHeightThumb( false ),
   mForceVScrollBar( ScrollBarAlwaysOn ),
+   mUseConstantHeightThumb( false ),
+   mWillFirstRespond( true ),
   mForceHScrollBar( ScrollBarAlwaysOn ),
   mLockHorizScroll( false ),
   mLockVertScroll( false ),
   mIgnoreChildResized( false ),
   mAnimating( false ),
   mScrollAnimSpeed( -1 ),
-   mScrollTargetPos( -1, -1 ),
-   mChildExt(0, 0),
   mChildPos(0, 0),
+   mChildExt(0, 0),
+   mScrollTargetPos( -1, -1 ),
   mBaseThumbSize(0)
 {
   mIsContainer = true;
--- a/Engine/source/gui/containers/guiWindowCtrl.cpp
+++ b/Engine/source/gui/containers/guiWindowCtrl.cpp
@ -70,16 +70,16 @@ IMPLEMENT_CALLBACK( GuiWindowCtrl, onRestore, void, (), (),
 //-----------------------------------------------------------------------------

 GuiWindowCtrl::GuiWindowCtrl()
-   :  mResizeEdge(edgeNone),
-      mResizeWidth(true),
+   :  mResizeWidth(true),
+      mResizeEdge(edgeNone),
      mResizeHeight(true),
-      mResizeMargin(2.f),
      mCanMove(true),
+      mResizeMargin(2.f),
      mCanClose(true),
      mCanMinimize(true),
      mCanMaximize(true),
-      mCanDock(false),
      mCanCollapse(false),
+      mCanDock(false),
      mEdgeSnap(true),
      mCollapseGroup(-1),
      mCollapseGroupNum(-1),
--- a/Engine/source/gui/controls/guiDecoyCtrl.cpp
+++ b/Engine/source/gui/controls/guiDecoyCtrl.cpp
@ -52,8 +52,8 @@ ConsoleDocClass( GuiDecoyCtrl,
 				"Currently editor use only, no real application without extension.\n\n "
 				"@internal");

-GuiDecoyCtrl::GuiDecoyCtrl() : mIsDecoy(true),
-							   mMouseOver(false),
+GuiDecoyCtrl::GuiDecoyCtrl() : mMouseOver(false),
+							   mIsDecoy(true),
 							   mDecoyReference(NULL)
 {
 }
--- a/Engine/source/gui/controls/guiGameListMenuCtrl.cpp
+++ b/Engine/source/gui/controls/guiGameListMenuCtrl.cpp
@ -32,8 +32,8 @@

 GuiGameListMenuCtrl::GuiGameListMenuCtrl()
 : mSelected(NO_ROW),
-   mHighlighted(NO_ROW),
-   mDebugRender(false)
+   mDebugRender(false),
+   mHighlighted(NO_ROW)
 {
   VECTOR_SET_ASSOCIATION(mRows);

--- a/Engine/source/gui/controls/guiMLTextCtrl.cpp
+++ b/Engine/source/gui/controls/guiMLTextCtrl.cpp
@ -237,8 +237,8 @@ GuiMLTextCtrl::GuiMLTextCtrl()
  mCurY( 0 ), 
  mCurClipX( 0 ), 
  mLineAtoms( NULL ), 
-  mLineAtomPtr( &mLineAtoms ), 
  mLineList( NULL ),
+  mLineAtomPtr( &mLineAtoms ), 
  mLineInsert( &mLineList ), 
  mScanPos( 0 ),
  mCurX( 0 ),
@ -247,8 +247,8 @@ GuiMLTextCtrl::GuiMLTextCtrl()
  mLineStart( 0 ),
  mVertMoveAnchor( 0 ),
  mVertMoveAnchorValid( false ),
-  mSelectionAnchor( 0 ),
  mIsEditCtrl( false ),
+  mSelectionAnchor( 0 ),
  mCursorPosition( false ),
  mMaxBufferSize( -1 ),
  mInitialText( StringTable->EmptyString() ),
@ -257,13 +257,13 @@ GuiMLTextCtrl::GuiMLTextCtrl()
  mSelectionEnd( 0 ),
  mLineSpacingPixels( 2 ),
  mAllowColorChars( false ),
-  mUseURLMouseCursor( false ),
  mBitmapList( 0 ),
+  mUseURLMouseCursor( false ),
  mBitmapRefList( 0 ),
-  mDirty( true ),  
  mTagList( NULL ),
-  mHitURL( 0 ),
+  mDirty( true ), 
  mAlpha( 1.0f ),
+  mHitURL( 0 ),
  mFontList( NULL )
 {   
   mActive = true;
--- a/Engine/source/gui/controls/guiSliderCtrl.cpp
+++ b/Engine/source/gui/controls/guiSliderCtrl.cpp
@ -97,8 +97,8 @@ GuiSliderCtrl::GuiSliderCtrl()
     mIncAmount( 0.f ),
     mDisplayValue( false ),
     mMouseOver( false ),
-     mMouseDragged( false ),
-     mDepressed( false )
+     mDepressed( false ),
+     mMouseDragged( false )
 {
 }

--- a/Engine/source/gui/core/guiCanvas.cpp
+++ b/Engine/source/gui/core/guiCanvas.cpp
@ -100,33 +100,33 @@ GuiCanvas::GuiCanvas(): GuiControl(),
                        mCursorEnabled(true),
                        mForceMouseToGUI(false),
                        mAlwaysHandleMouseButtons(false),
-                        mCursorChanged(0),
-                        mClampTorqueCursor(true),
                        mShowCursor(true),
+                        mClampTorqueCursor(true),
+                        mCursorChanged(0),
                        mLastCursorEnabled(false),
-                        mMouseControl(NULL),
                        mMouseCapturedControl(NULL),
+                        mMouseControl(NULL),
                        mMouseControlClicked(false),
                        mMouseButtonDown(false),
                        mMouseRightButtonDown(false),
-                        mMouseMiddleButtonDown(false),
                        mDefaultCursor(NULL),
-                        mLastCursor(NULL),
-                        mLastCursorPt(0,0),
+                        mMouseMiddleButtonDown(false),
                        mCursorPt(0,0),
+                        mLastCursorPt(0,0),
+                        mLastCursor(NULL),
                        mLastMouseClickCount(0),
-                        mLastMouseDownTime(0),
-                        mPrevMouseTime(0),
                        mRenderFront(false),
+                        mPrevMouseTime(0),
+                        mLastMouseDownTime(0),
                        mHoverControl(NULL),
                        mHoverPositionSet(false),
-                        mHoverLeftControlTime(0),
                        mLeftMouseLast(false),
+                        mHoverLeftControlTime(0),
                        mMiddleMouseLast(false),
                        mRightMouseLast(false),
                        mMouseDownPoint(0.0f,0.0f),
-                        mPlatformWindow(NULL),
                        mLastRenderMs(0),
+                        mPlatformWindow(NULL),
                        mDisplayWindow(true),
                        mMenuBarCtrl(NULL)
 {
--- a/Engine/source/gui/editor/guiEditCtrl.cpp
+++ b/Engine/source/gui/editor/guiEditCtrl.cpp
@ -95,12 +95,12 @@ GuiEditCtrl::GuiEditCtrl()
     mDragBeginPoint( -1, -1 ),
     mSnapToControls( true ),
     mSnapToEdges( true ),
-     mSnapToCenters( true ),
     mSnapToGuides( true ),
+     mSnapToCenters( true ),
     mSnapToCanvas( true ),
-     mSnapSensitivity( 2 ),
-     mFullBoxSelection( false ),
     mDrawBorderLines( true ),
+     mFullBoxSelection( false ),
+     mSnapSensitivity( 2 ),
     mDrawGuides( true )
 {
   VECTOR_SET_ASSOCIATION( mSelectedControls );
--- a/Engine/source/gui/editor/guiShapeEdPreview.cpp
+++ b/Engine/source/gui/editor/guiShapeEdPreview.cpp
@ -63,28 +63,28 @@ GuiShapeEdPreview::GuiShapeEdPreview()
 :  mOrbitDist( 5.0f ),
   mMoveSpeed ( 1.0f ),
   mZoomSpeed ( 1.0f ),
-   mModel( NULL ),
   mGridDimension( 30, 30 ),
+   mModel( NULL ),
   mRenderGhost( false ),
   mRenderNodes( false ),
   mRenderBounds( false ),
   mRenderObjBox( false ),
   mRenderMounts( true ),
   mSunDiffuseColor( 255, 255, 255, 255 ),
-   mSunAmbientColor( 140, 140, 140, 255 ),
   mSelectedNode( -1 ),
+   mSunAmbientColor( 140, 140, 140, 255 ),
   mHoverNode( -1 ),
   mSelectedObject( -1 ),
-   mSelectedObjDetail( 0 ),
   mUsingAxisGizmo( false ),
-   mGizmoDragID( 0 ),
+   mSelectedObjDetail( 0 ),
   mEditingSun( false ),
+   mGizmoDragID( 0 ),
   mTimeScale( 1.0f ),
   mActiveThread( -1 ),
-   mLastRenderTime( 0 ),
   mFakeSun( NULL ),
-   mSunRot( 45.0f, 0, 135.0f ),
+   mLastRenderTime( 0 ),
   mCameraRot( 0, 0, 3.9f ),
+   mSunRot( 45.0f, 0, 135.0f ),
   mRenderCameraAxes( false ),
   mOrbitPos( 0, 0, 0 ),
   mFixedDetail( true ),
--- a/Engine/source/gui/editor/inspector/field.cpp
+++ b/Engine/source/gui/editor/inspector/field.cpp
@ -45,8 +45,8 @@ ConsoleDocClass( GuiInspectorField,
 GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
                                      GuiInspectorGroup* parent, 
                                      AbstractClassRep::Field* field ) 
- : mInspector( inspector ),
-   mParent( parent ), 
+ : mParent( parent ),
+   mInspector( inspector ),
   mField( field ), 
   mFieldArrayIndex( NULL ), 
   mEdit( NULL )
@ -66,12 +66,12 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
 //-----------------------------------------------------------------------------

 GuiInspectorField::GuiInspectorField() 
- : mInspector( NULL ),
-   mParent( NULL ), 
+ : mParent( NULL ),
+   mInspector( NULL ),
+   mField( NULL ),
   mEdit( NULL ),
-   mField( NULL ), 
-   mFieldArrayIndex( NULL ),
   mCaption( StringTable->EmptyString() ),
+   mFieldArrayIndex( NULL ),
   mHighlighted( false )
 {
   setCanSave( false );
--- a/Engine/source/gui/worldEditor/creator.cpp
+++ b/Engine/source/gui/worldEditor/creator.cpp
@ -42,8 +42,8 @@ CreatorTree::Node::Node() :
   mFlags(0),
   mParent(0),
   mName(0),
-   mValue(0),
   mId(0),
+   mValue(0),
   mTab(0)
 {
   VECTOR_SET_ASSOCIATION(mChildren);
--- a/Engine/source/gui/worldEditor/gizmo.cpp
+++ b/Engine/source/gui/worldEditor/gizmo.cpp
@ -292,10 +292,10 @@ F32 Gizmo::smProjectDistance = 20000.0f;

 Gizmo::Gizmo()
 : mProfile( NULL ),
-  mSelectionIdx( -1 ),
-  mCameraMat( true ),
-  mTransform( true ),
  mObjectMat( true ),
+  mTransform( true ),
+  mCameraMat( true ),
+  mSelectionIdx( -1 ),
  mObjectMatInv( true ),
  mCurrentTransform( true ),
  mSavedTransform( true ),
@ -303,23 +303,23 @@ Gizmo::Gizmo()
  mDeltaScale( 0,0,0 ),
  mDeltaRot( 0,0,0 ),
  mDeltaPos( 0,0,0 ),
-  mDeltaTotalPos( 0,0,0 ),
-  mDeltaTotalRot( 0,0,0 ),
-  mDeltaTotalScale( 0,0,0 ),
  mCurrentAlignment( World ),
+  mDeltaTotalScale( 0,0,0 ),
+  mDeltaTotalRot( 0,0,0 ),
+  mDeltaTotalPos( 0,0,0 ),
  mCurrentMode( MoveMode ),
-  mDirty( false ),
  mMouseDownPos( -1,-1 ),
+  mDirty( false ),
  mMouseDown( false ),
  mLastWorldMat( true ),
  mLastProjMat( true ),
  mLastViewport( 0, 0, 10, 10 ),
  mLastCameraFOV( 1.f ),
-  mElipseCursorCollideVecSS( 1.0f, 0.0f, 0.0f ),
-  mElipseCursorCollidePntSS( 0.0f, 0.0f, 0.0f ),
  mHighlightCentroidHandle( false ),
-  mHighlightAll( false ),
+  mElipseCursorCollidePntSS( 0.0f, 0.0f, 0.0f ),
+  mElipseCursorCollideVecSS( 1.0f, 0.0f, 0.0f ),
  mGridPlaneEnabled( true ),
+  mHighlightAll( false ),
  mMoveGridEnabled( true ),
  mMoveGridSize( 20.f ),
  mMoveGridSpacing( 1.f )
--- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
+++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp
@ -58,8 +58,8 @@ ConsoleDocClass( GuiConvexEditorCtrl,

 GuiConvexEditorCtrl::GuiConvexEditorCtrl()
 : mIsDirty( false ),
-   mFaceHL( -1 ),
   mFaceSEL( -1 ),
+   mFaceHL( -1 ),
   mFaceSavedXfm( true ),
   mSavedUndo( false ),
   mDragging( false ),
@ -68,12 +68,12 @@ GuiConvexEditorCtrl::GuiConvexEditorCtrl()
   mUsingPivot( false ),
   mSettingPivot( false ),
   mActiveTool( NULL ),
-   mCreateTool( NULL ),
   mMouseDown( false ),
-   mUndoManager( NULL ),
-   mLastUndo( NULL ),
-   mHasCopied( false ),
+   mCreateTool( NULL ),
   mSavedGizmoFlags( -1 ),
+   mHasCopied( false ),
+   mLastUndo( NULL ),
+   mUndoManager( NULL ),
   mCtrlDown( false )
 {   
 	mMaterialName = StringTable->insert("Grid512_OrangeLines_Mat");
--- a/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.cpp
+++ b/Engine/source/gui/worldEditor/guiTerrPreviewCtrl.cpp
@ -36,7 +36,7 @@ ConsoleDocClass( GuiTerrPreviewCtrl,
   "@internal"
 );

-GuiTerrPreviewCtrl::GuiTerrPreviewCtrl(void) : mTerrainEditor(NULL), mTerrainSize(2048.0f)
+GuiTerrPreviewCtrl::GuiTerrPreviewCtrl(void) : mTerrainSize(2048.0f), mTerrainEditor(NULL)
 {
   mRoot.set( 0, 0 );
   mOrigin.set( 0, 0 );
--- a/Engine/source/gui/worldEditor/terrainEditor.cpp
+++ b/Engine/source/gui/worldEditor/terrainEditor.cpp
@ -668,11 +668,11 @@ TerrainEditor::TerrainEditor() :
   mMousePos(0,0,0),
   mMouseBrush(0),
   mInAction(false),
-   mUndoSel(0),
   mGridUpdateMin( S32_MAX, S32_MAX ),
+   mUndoSel(0),
   mGridUpdateMax( 0, 0 ),
-   mMaxBrushSize(256,256),
   mNeedsGridUpdate( false ),
+   mMaxBrushSize(256,256),
   mNeedsMaterialUpdate( false ),
   mMouseDown( false )
 {
--- a/Engine/source/gui/worldEditor/worldEditorSelection.cpp
+++ b/Engine/source/gui/worldEditor/worldEditorSelection.cpp
@ -38,8 +38,8 @@ ConsoleDocClass( WorldEditorSelection,
 WorldEditorSelection::WorldEditorSelection()
   :  mCentroidValid(false),
      mAutoSelect(false),
-      mPrevCentroid(0.0f, 0.0f, 0.0f),
-      mContainsGlobalBounds(false)
+      mContainsGlobalBounds(false),
+      mPrevCentroid(0.0f, 0.0f, 0.0f)
 {
   // Selections are transient by default.
   setCanSave( false );