diff --git a/Engine/source/gui/3d/guiTSControl.cpp b/Engine/source/gui/3d/guiTSControl.cpp index 0be010272..7183e0877 100644 --- a/Engine/source/gui/3d/guiTSControl.cpp +++ b/Engine/source/gui/3d/guiTSControl.cpp @@ -164,6 +164,8 @@ GuiTSCtrl::GuiTSCtrl() mLastCameraQuery.hasStereoTargets = false; mLastCameraQuery.ortho = false; + mOrthoWidth = 0.1f; + mOrthoHeight = 0.1f; } //----------------------------------------------------------------------------- diff --git a/Engine/source/gui/buttons/guiButtonCtrl.cpp b/Engine/source/gui/buttons/guiButtonCtrl.cpp index 14d6f1aa7..c0d5f4e08 100644 --- a/Engine/source/gui/buttons/guiButtonCtrl.cpp +++ b/Engine/source/gui/buttons/guiButtonCtrl.cpp @@ -58,6 +58,7 @@ GuiButtonCtrl::GuiButtonCtrl() { setExtent(140, 30); mButtonText = StringTable->EmptyString(); + mHasTheme = false; } //----------------------------------------------------------------------------- @@ -121,4 +122,4 @@ void GuiButtonCtrl::onRender(Point2I offset, //render the children renderChildControls( offset, updateRect); -} \ No newline at end of file +} diff --git a/Engine/source/gui/containers/guiAutoScrollCtrl.cpp b/Engine/source/gui/containers/guiAutoScrollCtrl.cpp index 08104d0f3..5d252bc53 100644 --- a/Engine/source/gui/containers/guiAutoScrollCtrl.cpp +++ b/Engine/source/gui/containers/guiAutoScrollCtrl.cpp @@ -90,8 +90,10 @@ EndImplementEnumType; GuiAutoScrollCtrl::GuiAutoScrollCtrl() : mDirection( Up ), mIsLooping( true ), - mCurrentPhase( PhaseComplete ), + mCurrentPhase( GuiAutoScrollCtrl::PhaseComplete ), mCurrentTime( 0.f ), + mCompleteTime(FLT_MAX), + mCurrentPosition(0.0f), mStartDelay( 3.f ), mResetDelay( 5.f ), mChildBorder( 10 ), diff --git a/Engine/source/gui/containers/guiFormCtrl.cpp b/Engine/source/gui/containers/guiFormCtrl.cpp index 0c562d49d..4cbb7ffa9 100644 --- a/Engine/source/gui/containers/guiFormCtrl.cpp +++ b/Engine/source/gui/containers/guiFormCtrl.cpp @@ -59,6 +59,7 @@ GuiFormCtrl::GuiFormCtrl() // The attached menu bar mHasMenu = false; mMenuBar = NULL; + mMouseMovingWin = false; } GuiFormCtrl::~GuiFormCtrl() diff --git a/Engine/source/gui/containers/guiFrameCtrl.h b/Engine/source/gui/containers/guiFrameCtrl.h index 682946198..8f5ff99db 100644 --- a/Engine/source/gui/containers/guiFrameCtrl.h +++ b/Engine/source/gui/containers/guiFrameCtrl.h @@ -114,10 +114,6 @@ protected: /* member variables */ Vector mColumnOffsets; Vector mRowOffsets; - GuiCursor *mMoveCursor; - GuiCursor *mUpDownCursor; - GuiCursor *mLeftRightCursor; - GuiCursor *mDefaultCursor; FrameDetail mFramesetDetails; VectorPtr mFrameDetails; bool mAutoBalance; diff --git a/Engine/source/gui/containers/guiRolloutCtrl.cpp b/Engine/source/gui/containers/guiRolloutCtrl.cpp index 6f2272d9a..095a6a358 100644 --- a/Engine/source/gui/containers/guiRolloutCtrl.cpp +++ b/Engine/source/gui/containers/guiRolloutCtrl.cpp @@ -74,7 +74,10 @@ GuiRolloutCtrl::GuiRolloutCtrl() mIsContainer = true; mCanCollapse = true; mAutoCollapseSiblings = false; + mDefaultCursor = NULL; + mVertSizingCursor = NULL; mHasTexture = false; + mBitmapBounds = NULL; // Make sure we receive our ticks. setProcessTicks(); } diff --git a/Engine/source/gui/containers/guiScrollCtrl.cpp b/Engine/source/gui/containers/guiScrollCtrl.cpp index bea540e19..a52a5816e 100644 --- a/Engine/source/gui/containers/guiScrollCtrl.cpp +++ b/Engine/source/gui/containers/guiScrollCtrl.cpp @@ -74,10 +74,22 @@ GuiScrollCtrl::GuiScrollCtrl() mChildPos(0, 0), mChildExt(0, 0), mScrollTargetPos( -1, -1 ), - mBaseThumbSize(0) + mBaseThumbSize(0), + mHBarEnabled(false), + mVBarEnabled(false), + mHasHScrollBar(false), + mHasVScrollBar(false), + mHThumbSize(1), + mHThumbPos(0), + mVThumbSize(1), + mVThumbPos(0), + mThumbMouseDelta(0) { + mBitmapBounds = NULL; mIsContainer = true; setExtent(200,200); + mLastPreRender = Platform::getVirtualMilliseconds(); + mLastUpdated = Platform::getVirtualMilliseconds(); } //----------------------------------------------------------------------------- diff --git a/Engine/source/gui/containers/guiWindowCtrl.cpp b/Engine/source/gui/containers/guiWindowCtrl.cpp index 20af7fc2e..17000909b 100644 --- a/Engine/source/gui/containers/guiWindowCtrl.cpp +++ b/Engine/source/gui/containers/guiWindowCtrl.cpp @@ -116,6 +116,11 @@ GuiWindowCtrl::GuiWindowCtrl() mMaximizeButtonPressed = false; mMinimizeButtonPressed = false; + mRepositionWindow = false; + mResizeWindow = false; + mSnapSignal = false; + mPreCollapsedYExtent = 200; + mPreCollapsedYMinExtent = 176; mText = "New Window"; } diff --git a/Engine/source/gui/controls/guiDecoyCtrl.cpp b/Engine/source/gui/controls/guiDecoyCtrl.cpp index f7fd881e8..61b489995 100644 --- a/Engine/source/gui/controls/guiDecoyCtrl.cpp +++ b/Engine/source/gui/controls/guiDecoyCtrl.cpp @@ -54,7 +54,8 @@ ConsoleDocClass( GuiDecoyCtrl, GuiDecoyCtrl::GuiDecoyCtrl() : mMouseOver(false), mIsDecoy(true), - mDecoyReference(NULL) + mDecoyReference(NULL), + mMouseOverDecoy(false) { } @@ -235,4 +236,4 @@ void GuiDecoyCtrl::onMiddleMouseUp(const GuiEvent &) void GuiDecoyCtrl::onMiddleMouseDragged(const GuiEvent &) { -} \ No newline at end of file +} diff --git a/Engine/source/gui/controls/guiPopUpCtrl.cpp b/Engine/source/gui/controls/guiPopUpCtrl.cpp index 418f1a0de..40649b920 100644 --- a/Engine/source/gui/controls/guiPopUpCtrl.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrl.cpp @@ -280,6 +280,10 @@ GuiPopUpMenuCtrl::GuiPopUpMenuCtrl(void) mBitmapName = StringTable->EmptyString(); // Added mBitmapBounds.set(16, 16); // Added mIdMax = -1; + mBackground = NULL; + mTl = NULL; + mSc = NULL; + mReplaceText = false; } //------------------------------------------------------------------------------ diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp index bec481163..bd8462ecd 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp @@ -332,6 +332,10 @@ GuiPopUpMenuCtrlEx::GuiPopUpMenuCtrlEx(void) mBitmapBounds.set(16, 16); // Added mHotTrackItems = false; mIdMax = -1; + mBackground = NULL; + mTl = NULL; + mSc = NULL; + mReplaceText = false; } //------------------------------------------------------------------------------ diff --git a/Engine/source/gui/controls/guiSliderCtrl.cpp b/Engine/source/gui/controls/guiSliderCtrl.cpp index d84d6311b..3b2090427 100644 --- a/Engine/source/gui/controls/guiSliderCtrl.cpp +++ b/Engine/source/gui/controls/guiSliderCtrl.cpp @@ -100,8 +100,10 @@ GuiSliderCtrl::GuiSliderCtrl() mMouseOver( false ), mDepressed( false ), mMouseDragged( false ), + mHasTexture(false), mUseFillBar(false), - mFillBarColor(ColorI(255,255,255)) + mFillBarColor(ColorI(255,255,255)), + mBitmapBounds(NULL) { } diff --git a/Engine/source/gui/controls/guiTabPageCtrl.cpp b/Engine/source/gui/controls/guiTabPageCtrl.cpp index c87363cde..b8c84ff0b 100644 --- a/Engine/source/gui/controls/guiTabPageCtrl.cpp +++ b/Engine/source/gui/controls/guiTabPageCtrl.cpp @@ -53,6 +53,7 @@ GuiTabPageCtrl::GuiTabPageCtrl(void) dStrcpy(mText,(UTF8*)"TabPage", MAX_STRING_LENGTH); mActive = true; mIsContainer = true; + mTabIndex = -1; } void GuiTabPageCtrl::initPersistFields() diff --git a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.cpp b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.cpp index 37ed5fe54..055b7890f 100644 --- a/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.cpp +++ b/Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.cpp @@ -95,6 +95,8 @@ GuiTextEditSliderBitmapCtrl::GuiTextEditSliderBitmapCtrl() mTextAreaHit = None; mFocusOnMouseWheel = false; mBitmapName = StringTable->insert( "" ); + mMouseDownTime = 0; + mNumberOfBitmaps = 0; } GuiTextEditSliderBitmapCtrl::~GuiTextEditSliderBitmapCtrl() @@ -444,4 +446,4 @@ void GuiTextEditSliderBitmapCtrl::setBitmap(const char *name) if(awake) onWake(); setUpdate(); -} \ No newline at end of file +} diff --git a/Engine/source/gui/controls/guiTextEditSliderCtrl.cpp b/Engine/source/gui/controls/guiTextEditSliderCtrl.cpp index a3e9c884f..599678fc3 100644 --- a/Engine/source/gui/controls/guiTextEditSliderCtrl.cpp +++ b/Engine/source/gui/controls/guiTextEditSliderCtrl.cpp @@ -62,6 +62,7 @@ GuiTextEditSliderCtrl::GuiTextEditSliderCtrl() mFormat = StringTable->insert("%3.2f"); mTextAreaHit = None; mFocusOnMouseWheel = false; + mMouseDownTime = 0.0f; } GuiTextEditSliderCtrl::~GuiTextEditSliderCtrl() diff --git a/Engine/source/gui/core/guiCanvas.cpp b/Engine/source/gui/core/guiCanvas.cpp index 7e8d95190..a7d5442e5 100644 --- a/Engine/source/gui/core/guiCanvas.cpp +++ b/Engine/source/gui/core/guiCanvas.cpp @@ -150,6 +150,7 @@ GuiCanvas::GuiCanvas(): GuiControl(), #else mNumFences = 0; #endif + mConsumeLastInputEvent = false; } GuiCanvas::~GuiCanvas() diff --git a/Engine/source/gui/core/guiScriptNotifyControl.cpp b/Engine/source/gui/core/guiScriptNotifyControl.cpp index bd1cc63de..93ec5bb90 100644 --- a/Engine/source/gui/core/guiScriptNotifyControl.cpp +++ b/Engine/source/gui/core/guiScriptNotifyControl.cpp @@ -57,6 +57,8 @@ GuiScriptNotifyCtrl::GuiScriptNotifyCtrl() mOnResize = false; mOnChildResized = false; mOnParentResized = false; + mOnLoseFirstResponder = true; + mOnGainFirstResponder = true; } GuiScriptNotifyCtrl::~GuiScriptNotifyCtrl() diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp index 7fbbe62c0..7ef0ef4ad 100644 --- a/Engine/source/gui/core/guiTypes.cpp +++ b/Engine/source/gui/core/guiTypes.cpp @@ -79,6 +79,7 @@ GuiCursor::GuiCursor() mRenderOffset.set(0.0f,0.0f); mExtent.set(1,1); mTextureObject = NULL; + mBitmapName = StringTable->EmptyString(); } GuiCursor::~GuiCursor() diff --git a/Engine/source/gui/editor/guiDebugger.cpp b/Engine/source/gui/editor/guiDebugger.cpp index 7c60d4359..4ad0e6683 100644 --- a/Engine/source/gui/editor/guiDebugger.cpp +++ b/Engine/source/gui/editor/guiDebugger.cpp @@ -64,6 +64,12 @@ DbgFileView::DbgFileView() mFindLineNumber = -1; mSize.set(1, 0); + mbMouseDragging = false; + mMouseDownChar = -1; + mMouseOverVariable[0] = '\0'; + mMouseOverValue[0] = '\0'; + mMouseVarStart = -1; + mMouseVarEnd = -1; } DefineEngineMethod(DbgFileView, setCurrentLine, void, (S32 line, bool selected), , "(int line, bool selected)" diff --git a/Engine/source/gui/editor/guiEditCtrl.cpp b/Engine/source/gui/editor/guiEditCtrl.cpp index 208c9b4fc..6be77962c 100644 --- a/Engine/source/gui/editor/guiEditCtrl.cpp +++ b/Engine/source/gui/editor/guiEditCtrl.cpp @@ -101,7 +101,9 @@ GuiEditCtrl::GuiEditCtrl() mDrawBorderLines( true ), mFullBoxSelection( false ), mSnapSensitivity( 2 ), - mDrawGuides( true ) + mDrawGuides( true ), + mDragAddSelection(false), + mDragMoveUndo(false) { VECTOR_SET_ASSOCIATION( mSelectedControls ); VECTOR_SET_ASSOCIATION( mDragBeginPoints ); @@ -116,11 +118,21 @@ GuiEditCtrl::GuiEditCtrl() mDragGuide[ GuideVertical ] = false; mDragGuide[ GuideHorizontal ] = false; + mDragGuideIndex[0] = 0; + mDragGuideIndex[1] = 1; + + std::fill_n(mSnapOffset, 2, 0); + std::fill_n(mSnapEdge, 2, SnapEdgeMin); if( !smGuidesPropertyName[ GuideVertical ] ) smGuidesPropertyName[ GuideVertical ] = StringTable->insert( "guidesVertical" ); if( !smGuidesPropertyName[ GuideHorizontal ] ) smGuidesPropertyName[ GuideHorizontal ] = StringTable->insert( "guidesHorizontal" ); + + mTrash = NULL; + mSelectedSet = NULL; + mMouseDownMode = GuiEditCtrl::Selecting; + mSizingMode = GuiEditCtrl::sizingNone; } //----------------------------------------------------------------------------- diff --git a/Engine/source/gui/editor/guiInspectorTypes.cpp b/Engine/source/gui/editor/guiInspectorTypes.cpp index 0e8f341a4..818df2ba1 100644 --- a/Engine/source/gui/editor/guiInspectorTypes.cpp +++ b/Engine/source/gui/editor/guiInspectorTypes.cpp @@ -1087,7 +1087,7 @@ bool GuiInspectorTypeEaseF::updateRects() // GuiInspectorTypeColor (Base for ColorI/LinearColorF) //----------------------------------------------------------------------------- GuiInspectorTypeColor::GuiInspectorTypeColor() - : mBrowseButton( NULL ) + : mColorFunction(NULL), mBrowseButton( NULL ) { } diff --git a/Engine/source/gui/editor/guiParticleGraphCtrl.cpp b/Engine/source/gui/editor/guiParticleGraphCtrl.cpp index 4b71a1518..d27be2f1a 100644 --- a/Engine/source/gui/editor/guiParticleGraphCtrl.cpp +++ b/Engine/source/gui/editor/guiParticleGraphCtrl.cpp @@ -102,6 +102,8 @@ GuiParticleGraphCtrl::GuiParticleGraphCtrl() mPointXMovementClamped = false; mOutlineColor = ColorI(1, 1, 1); mCursorPos = Point2I(0, 0); + mTooltipSelectedPlot = 0; + mRenderNextGraphTooltip = false; } ImplementEnumType( GuiParticleGraphType, diff --git a/Engine/source/gui/editor/guiPopupMenuCtrl.cpp b/Engine/source/gui/editor/guiPopupMenuCtrl.cpp index 9fb25c497..e405864cf 100644 --- a/Engine/source/gui/editor/guiPopupMenuCtrl.cpp +++ b/Engine/source/gui/editor/guiPopupMenuCtrl.cpp @@ -95,6 +95,7 @@ GuiPopupMenuTextListCtrl::GuiPopupMenuTextListCtrl() mPopup = nullptr; mLastHighlightedMenuIdx = -1; + mBackground = NULL; } void GuiPopupMenuTextListCtrl::onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) @@ -258,4 +259,4 @@ void GuiPopupMenuTextListCtrl::onCellHighlighted(Point2I cell) list->mSubMenu->showPopup(getRoot(), getPosition().x + mCellSize.x, getPosition().y + (selectionIndex * mCellSize.y)); } } -} \ No newline at end of file +} diff --git a/Engine/source/gui/editor/guiShapeEdPreview.cpp b/Engine/source/gui/editor/guiShapeEdPreview.cpp index bb83d85d7..5f8a80279 100644 --- a/Engine/source/gui/editor/guiShapeEdPreview.cpp +++ b/Engine/source/gui/editor/guiShapeEdPreview.cpp @@ -69,6 +69,7 @@ GuiShapeEdPreview::GuiShapeEdPreview() mRenderNodes( false ), mRenderBounds( false ), mRenderObjBox( false ), + mRenderColMeshes( false ), mRenderMounts( true ), mSunDiffuseColor( 255, 255, 255, 255 ), mSelectedNode( -1 ), diff --git a/Engine/source/gui/editor/inspector/customField.cpp b/Engine/source/gui/editor/inspector/customField.cpp index 27feb7ebe..ac92f37bd 100644 --- a/Engine/source/gui/editor/inspector/customField.cpp +++ b/Engine/source/gui/editor/inspector/customField.cpp @@ -42,13 +42,15 @@ GuiInspectorCustomField::GuiInspectorCustomField( GuiInspector *inspector, { mInspector = inspector; mParent = parent; - setBounds(0,0,100,20); + setBounds(0,0,100,20); + mDoc = StringTable->insert("no Docs Found!"); } GuiInspectorCustomField::GuiInspectorCustomField() { mInspector = NULL; mParent = NULL; + mDoc = StringTable->insert("no Docs Found!"); } void GuiInspectorCustomField::setData( const char* data, bool callbacks ) diff --git a/Engine/source/gui/editor/inspector/dynamicField.h b/Engine/source/gui/editor/inspector/dynamicField.h index 405717295..477873395 100644 --- a/Engine/source/gui/editor/inspector/dynamicField.h +++ b/Engine/source/gui/editor/inspector/dynamicField.h @@ -34,7 +34,7 @@ class GuiInspectorDynamicField : public GuiInspectorField public: GuiInspectorDynamicField( GuiInspector *inspector, GuiInspectorGroup* parent, SimFieldDictionary::Entry* field ); - GuiInspectorDynamicField() {}; + GuiInspectorDynamicField() :mDynField(NULL), mDeleteButton(NULL) {}; ~GuiInspectorDynamicField() {}; DECLARE_CONOBJECT( GuiInspectorDynamicField ); diff --git a/Engine/source/gui/editor/inspector/dynamicGroup.h b/Engine/source/gui/editor/inspector/dynamicGroup.h index 65708159d..fdc8d19c2 100644 --- a/Engine/source/gui/editor/inspector/dynamicGroup.h +++ b/Engine/source/gui/editor/inspector/dynamicGroup.h @@ -37,9 +37,9 @@ private: public: DECLARE_CONOBJECT(GuiInspectorDynamicGroup); - GuiInspectorDynamicGroup() { /*mNeedScroll=false;*/ }; + GuiInspectorDynamicGroup() { mAddCtrl = NULL;/*mNeedScroll=false;*/ }; GuiInspectorDynamicGroup( StringTableEntry groupName, SimObjectPtr parent ) - : GuiInspectorGroup( groupName, parent) { /*mNeedScroll=false;*/}; + : GuiInspectorGroup( groupName, parent) { mAddCtrl = NULL;/*mNeedScroll=false;*/}; //----------------------------------------------------------------------------- // inspectGroup is overridden in GuiInspectorDynamicGroup to inspect an diff --git a/Engine/source/gui/editor/inspector/field.cpp b/Engine/source/gui/editor/inspector/field.cpp index ccbb2f55f..84fc4ccfc 100644 --- a/Engine/source/gui/editor/inspector/field.cpp +++ b/Engine/source/gui/editor/inspector/field.cpp @@ -52,7 +52,11 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector, mEdit( NULL ), mTargetObject(NULL), mUseHeightOverride(false), - mHeightOverride(18) + mHighlighted(false), + mHeightOverride(18), + mSpecialEditField(false), + mVariableName(StringTable->EmptyString()), + mCallbackName(StringTable->EmptyString()) { if( field != NULL ) mCaption = field->pFieldname; diff --git a/Engine/source/gui/editor/inspector/variableField.cpp b/Engine/source/gui/editor/inspector/variableField.cpp index 8f39fb65d..63ed1cb1d 100644 --- a/Engine/source/gui/editor/inspector/variableField.cpp +++ b/Engine/source/gui/editor/inspector/variableField.cpp @@ -41,7 +41,10 @@ ConsoleDocClass( GuiInspectorVariableField, "@internal" ); -GuiInspectorVariableField::GuiInspectorVariableField() +GuiInspectorVariableField::GuiInspectorVariableField() + : mVariableName(StringTable->EmptyString()), + mSetCallbackName(StringTable->EmptyString()), + mOwnerObject(NULL) { } diff --git a/Engine/source/gui/game/guiMessageVectorCtrl.cpp b/Engine/source/gui/game/guiMessageVectorCtrl.cpp index 9f5f45800..2b2d12fc0 100644 --- a/Engine/source/gui/game/guiMessageVectorCtrl.cpp +++ b/Engine/source/gui/game/guiMessageVectorCtrl.cpp @@ -164,6 +164,7 @@ GuiMessageVectorCtrl::GuiMessageVectorCtrl() VECTOR_SET_ASSOCIATION(mLineElements); mMessageVector = NULL; + mMinSensibleWidth = 1; mLineSpacingPixels = 0; mLineContinuationIndent = 10; diff --git a/Engine/source/gui/game/guiProgressBitmapCtrl.cpp b/Engine/source/gui/game/guiProgressBitmapCtrl.cpp index df06e242d..1d7d621e7 100644 --- a/Engine/source/gui/game/guiProgressBitmapCtrl.cpp +++ b/Engine/source/gui/game/guiProgressBitmapCtrl.cpp @@ -121,7 +121,9 @@ GuiProgressBitmapCtrl::GuiProgressBitmapCtrl() : mProgress( 0.f ), mBitmapName( StringTable->EmptyString() ), mUseVariable( false ), - mTile( false ) + mTile( false ), + mNumberOfBitmaps(0), + mDim(0) { } diff --git a/Engine/source/gui/utility/guiBubbleTextCtrl.h b/Engine/source/gui/utility/guiBubbleTextCtrl.h index 909644c74..c8175d0f7 100644 --- a/Engine/source/gui/utility/guiBubbleTextCtrl.h +++ b/Engine/source/gui/utility/guiBubbleTextCtrl.h @@ -52,7 +52,7 @@ class GuiBubbleTextCtrl : public GuiTextCtrl DECLARE_DESCRIPTION( "A single-line text control that displays its text in a multi-line\n" "popup when clicked." ); - GuiBubbleTextCtrl() { mInAction = false; } + GuiBubbleTextCtrl() :mInAction(false), mDlg(NULL), mPopup(NULL), mMLText(NULL) {} virtual void onMouseDown(const GuiEvent &event); }; diff --git a/Engine/source/gui/worldEditor/creator.cpp b/Engine/source/gui/worldEditor/creator.cpp index 99264f4ba..c268787eb 100644 --- a/Engine/source/gui/worldEditor/creator.cpp +++ b/Engine/source/gui/worldEditor/creator.cpp @@ -146,7 +146,9 @@ S32 CreatorTree::Node::getSelected() CreatorTree::CreatorTree() : mCurId(0), mRoot(0), - mTxtOffset(5) + mTxtOffset(5), + mTabSize(11), + mMaxWidth(0) { VECTOR_SET_ASSOCIATION(mNodeList); clear(); diff --git a/Engine/source/gui/worldEditor/editTSCtrl.cpp b/Engine/source/gui/worldEditor/editTSCtrl.cpp index 8d9f98809..fbe4ff090 100644 --- a/Engine/source/gui/worldEditor/editTSCtrl.cpp +++ b/Engine/source/gui/worldEditor/editTSCtrl.cpp @@ -106,7 +106,7 @@ EditTSCtrl::EditTSCtrl() mMiddleMouseDown = false; mMiddleMouseTriggered = false; mMouseLeft = false; - + mLastMouseClamping = false; mBlendSB = NULL; } diff --git a/Engine/source/gui/worldEditor/gizmo.cpp b/Engine/source/gui/worldEditor/gizmo.cpp index 4b0ac19ab..7bfe554c4 100644 --- a/Engine/source/gui/worldEditor/gizmo.cpp +++ b/Engine/source/gui/worldEditor/gizmo.cpp @@ -202,6 +202,7 @@ GizmoProfile::GizmoProfile() centroidColor.set( 255, 255, 255 ); centroidHighlightColor.set( 255, 0, 255 ); + hideDisabledAxes = true; restoreDefaultState(); } @@ -297,6 +298,7 @@ Gizmo::Gizmo() mObjectMat( true ), mTransform( true ), mCameraMat( true ), + mProjLen(1000.0f), mSelectionIdx( -1 ), mObjectMatInv( true ), mCurrentTransform( true ), @@ -308,10 +310,13 @@ Gizmo::Gizmo() mCurrentAlignment( World ), mDeltaTotalScale( 0,0,0 ), mDeltaTotalRot( 0,0,0 ), + mDeltaAngle(0.0f), + mLastAngle(0.0f), mDeltaTotalPos( 0,0,0 ), mCurrentMode( MoveMode ), mMouseDownPos( -1,-1 ), mDirty( false ), + mSign(0.0f), mMouseDown( false ), mLastWorldMat( true ), mLastProjMat( true ), @@ -324,9 +329,10 @@ Gizmo::Gizmo() mHighlightAll( false ), mMoveGridEnabled( true ), mMoveGridSize( 20.f ), - mMoveGridSpacing( 1.f ) -{ - mUniformHandleEnabled = true; + mMoveGridSpacing( 1.f ), + mUniformHandleEnabled(true), + mScreenRotateHandleEnabled(false) +{ mAxisEnabled[0] = mAxisEnabled[1] = mAxisEnabled[2] = true; } diff --git a/Engine/source/gui/worldEditor/gizmo.h b/Engine/source/gui/worldEditor/gizmo.h index a9baf1aa1..5cc64514a 100644 --- a/Engine/source/gui/worldEditor/gizmo.h +++ b/Engine/source/gui/worldEditor/gizmo.h @@ -391,9 +391,9 @@ protected: /// Spacing between grid lines on the move grid. U32 mMoveGridSpacing; - bool mAxisEnabled[3]; bool mUniformHandleEnabled; bool mScreenRotateHandleEnabled; + bool mAxisEnabled[3]; // Used to override rendering of handles. bool mHighlightCentroidHandle; diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp index 5f1b32638..a53b0e641 100644 --- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp +++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.cpp @@ -68,6 +68,7 @@ GuiConvexEditorCtrl::GuiConvexEditorCtrl() mFaceHL( -1 ), mFaceSavedXfm( true ), mSavedUndo( false ), + mHasGeometry(false), mDragging( false ), mGizmoMatOffset( Point3F::Zero ), mPivotPos( Point3F::Zero ), diff --git a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h index 3f4b91606..6ede0cf61 100644 --- a/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h +++ b/Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h @@ -248,7 +248,7 @@ class GuiConvexEditorUndoAction : public UndoAction friend class GuiConvexEditorCtrl; public: - GuiConvexEditorUndoAction( const UTF8* actionName ) : UndoAction( actionName ) + GuiConvexEditorUndoAction( const UTF8* actionName ) : UndoAction( actionName ), mEditor(NULL), mObjId(NULL) { } diff --git a/Engine/source/gui/worldEditor/guiMissionArea.h b/Engine/source/gui/worldEditor/guiMissionArea.h index fb1d1cd85..caa0527cb 100644 --- a/Engine/source/gui/worldEditor/guiMissionArea.h +++ b/Engine/source/gui/worldEditor/guiMissionArea.h @@ -142,7 +142,7 @@ class GuiMissionAreaUndoAction : public UndoAction { public: - GuiMissionAreaUndoAction( const UTF8* actionName ) : UndoAction( actionName ) + GuiMissionAreaUndoAction( const UTF8* actionName ) : UndoAction( actionName ), mMissionAreaEditor(NULL), mObjId(NULL) { } diff --git a/Engine/source/gui/worldEditor/terrainActions.cpp b/Engine/source/gui/worldEditor/terrainActions.cpp index b64cade26..3fc07205d 100644 --- a/Engine/source/gui/worldEditor/terrainActions.cpp +++ b/Engine/source/gui/worldEditor/terrainActions.cpp @@ -773,7 +773,7 @@ ConsoleDocClass( TerrainSmoothAction, ); TerrainSmoothAction::TerrainSmoothAction() - : UndoAction( "Terrain Smoothing" ) + : UndoAction("Terrain Smoothing"), mFactor(1.0), mSteps(1), mTerrainId(NULL) { } @@ -836,4 +836,4 @@ void TerrainSmoothAction::redo() // Tell the terrain to update itself. terrain->updateGrid( Point2I::Zero, Point2I::Max, true ); -} \ No newline at end of file +} diff --git a/Engine/source/gui/worldEditor/terrainActions.h b/Engine/source/gui/worldEditor/terrainActions.h index e0e31d988..2fc0b2df5 100644 --- a/Engine/source/gui/worldEditor/terrainActions.h +++ b/Engine/source/gui/worldEditor/terrainActions.h @@ -211,7 +211,7 @@ class ScaleHeightAction : public TerrainAction class BrushAdjustHeightAction : public TerrainAction { public: - BrushAdjustHeightAction(TerrainEditor * editor) : TerrainAction(editor){} + BrushAdjustHeightAction(TerrainEditor* editor) : TerrainAction(editor) { mPreviousZ = 0.0f; } StringTableEntry getName(){return("brushAdjustHeight");} void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type); diff --git a/Engine/source/gui/worldEditor/undoActions.cpp b/Engine/source/gui/worldEditor/undoActions.cpp index de23353d8..2f137bc72 100644 --- a/Engine/source/gui/worldEditor/undoActions.cpp +++ b/Engine/source/gui/worldEditor/undoActions.cpp @@ -219,6 +219,7 @@ ConsoleDocClass( InspectorFieldUndoAction, InspectorFieldUndoAction::InspectorFieldUndoAction() { + mInspector = NULL; mObjId = 0; mField = NULL; mSlotName = StringTable->EmptyString(); diff --git a/Engine/source/gui/worldEditor/worldEditor.h b/Engine/source/gui/worldEditor/worldEditor.h index d52ecd699..e903e024b 100644 --- a/Engine/source/gui/worldEditor/worldEditor.h +++ b/Engine/source/gui/worldEditor/worldEditor.h @@ -133,6 +133,7 @@ class WorldEditor : public EditTSCtrl WorldEditorUndoAction( const UTF8* actionName ) : UndoAction( actionName ) { + mWorldEditor = NULL; } WorldEditor *mWorldEditor;