TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtuals removed

Browse source 
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:13:00 +00:00
parent 88a43f3137
commit efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/gui/3d/guiTSControl.h
View file

@ -122,9 +122,9 @@ public:
GuiTSCtrl();
void onPreRender();
void onPreRender() override;
void _internalRender(RectI guiViewport, RectI renderViewport, Frustum &frustum);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
virtual bool processCameraQuery(CameraQuery *query);
/// Subclasses can override this to perform 3D rendering.
@ -136,8 +136,8 @@ public:
static void initPersistFields();
static void consoleInit();
virtual bool onWake();
virtual void onSleep();
bool onWake() override;
void onSleep() override;
/// Returns the last World Matrix set in onRender.
const MatrixF& getLastWorldMatrix() const { return mSaveModelview; }

14
Engine/source/gui/buttons/guiBitmapButtonCtrl.h
View file

@ -172,15 +172,15 @@ class GuiBitmapButtonCtrl : public GuiButtonCtrl
void setBitmapHandles( GFXTexHandle normal, GFXTexHandle highlighted, GFXTexHandle depressed, GFXTexHandle inactive );
//Parent methods
virtual bool onWake();
virtual void onSleep();
virtual void onAction();
virtual void inspectPostApply();
bool onWake() override;
void onSleep() override;
void onAction() override;
void inspectPostApply() override;
virtual void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();
bool pointInControl(const Point2I& parentCoordPoint);
bool pointInControl(const Point2I& parentCoordPoint) override;
DECLARE_CONOBJECT(GuiBitmapButtonCtrl);
DECLARE_DESCRIPTION( "A button control rendered entirely from bitmaps.\n"
@ -207,7 +207,7 @@ class GuiBitmapButtonTextCtrl : public GuiBitmapButtonCtrl
protected:
virtual void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect );
void renderButton( GFXTexHandle &texture, const Point2I& offset, const RectI& updateRect ) override;
public:

30
Engine/source/gui/buttons/guiButtonBaseCtrl.h
View file

@ -80,7 +80,7 @@ protected:
public:
GuiButtonBaseCtrl();
bool onWake();
bool onWake() override;
DECLARE_CONOBJECT(GuiButtonBaseCtrl);
DECLARE_CATEGORY("Gui Buttons");
@ -101,25 +101,25 @@ public:
void setHighlighted(bool highlighted);
bool isHighlighted() { return mHighlighted; }
void acceleratorKeyPress(U32 index);
void acceleratorKeyRelease(U32 index);
void acceleratorKeyPress(U32 index) override;
void acceleratorKeyRelease(U32 index) override;
void onMouseDown(const GuiEvent&);
void onMouseUp(const GuiEvent&);
void onMouseDragged(const GuiEvent& event);
void onRightMouseUp(const GuiEvent&);
void onMouseDown(const GuiEvent&) override;
void onMouseUp(const GuiEvent&) override;
void onMouseDragged(const GuiEvent& event) override;
void onRightMouseUp(const GuiEvent&) override;
void onMouseEnter(const GuiEvent&);
void onMouseLeave(const GuiEvent&);
void onMouseEnter(const GuiEvent&) override;
void onMouseLeave(const GuiEvent&) override;
bool onKeyDown(const GuiEvent& event);
bool onKeyUp(const GuiEvent& event);
bool onKeyDown(const GuiEvent& event) override;
bool onKeyUp(const GuiEvent& event) override;
void setScriptValue(const char* value);
const char* getScriptValue();
void setScriptValue(const char* value) override;
const char* getScriptValue() override;
void onMessage(GuiControl*, S32 msg);
void onAction();
void onMessage(GuiControl*, S32 msg) override;
void onAction() override;
bool usesMouseEvents() const { return mUseMouseEvents; }
void setUseMouseEvents(bool val) { mUseMouseEvents = val; }

4
Engine/source/gui/buttons/guiButtonCtrl.h
View file

@ -35,8 +35,8 @@ protected:
public:
DECLARE_CONOBJECT(GuiButtonCtrl);
GuiButtonCtrl();
bool onWake();
void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onRender(Point2I offset, const RectI &updateRect) override;
};
#endif //_GUI_BUTTON_CTRL_H

4
Engine/source/gui/buttons/guiCheckBoxCtrl.h
View file

@ -46,8 +46,8 @@ class GuiCheckBoxCtrl : public GuiButtonBaseCtrl
S32 getIndent() const { return mIndent; }
void setIndent( S32 value ) { mIndent = value; }
void onRender( Point2I offset, const RectI &updateRect );
bool onWake();
void onRender( Point2I offset, const RectI &updateRect ) override;
bool onWake() override;
void autoSize();

18
Engine/source/gui/containers/guiContainer.h
View file

@ -133,21 +133,21 @@ class GuiContainer : public GuiControl
/// @name GuiControl Inherited
/// @{
virtual void onChildAdded(GuiControl* control);
virtual void onChildRemoved(GuiControl* control);
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual void childResized(GuiControl *child);
virtual void addObject(SimObject *obj);
virtual void removeObject(SimObject *obj);
virtual bool reOrder(SimObject* obj, SimObject* target);
virtual void onPreRender();
void onChildAdded(GuiControl* control) override;
void onChildRemoved(GuiControl* control) override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
void childResized(GuiControl *child) override;
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
bool reOrder(SimObject* obj, SimObject* target) override;
void onPreRender() override;
/// GuiContainer deals with parentResized calls differently than GuiControl. It will
/// update the layout for all of it's non-docked child controls. parentResized calls
/// on the child controls will be handled by their default functions, but for our
/// purposes we want at least our immediate children to use the anchors that they have
/// set on themselves. - JDD [9/20/2006]
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
/// @}
};

24
Engine/source/gui/containers/guiRolloutCtrl.h
View file

@ -118,7 +118,7 @@ class GuiRolloutCtrl : public GuiTickCtrl
DECLARE_CALLBACK( void, onCollapsed, () );
/// @}
virtual void processTick();
void processTick() override;
public:
@ -134,20 +134,20 @@ class GuiRolloutCtrl : public GuiTickCtrl
static void initPersistFields();
// Control Events
bool onWake();
void addObject(SimObject *obj);
void removeObject(SimObject *obj);
virtual void childResized(GuiControl *child);
bool onWake() override;
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
void childResized(GuiControl *child) override;
// Mouse Events
virtual void onMouseDown( const GuiEvent& event );
virtual void onMouseUp( const GuiEvent& event );
virtual void onRightMouseUp( const GuiEvent& event );
virtual bool onMouseUpEditor( const GuiEvent& event, Point2I offset );
void onMouseDown( const GuiEvent& event ) override;
void onMouseUp( const GuiEvent& event ) override;
void onRightMouseUp( const GuiEvent& event ) override;
bool onMouseUpEditor( const GuiEvent& event, Point2I offset ) override;
// Sizing Helpers
virtual void calculateHeights();
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
virtual void sizeToContents();
inline bool isExpanded() const { return mIsExpanded; }
@ -172,8 +172,8 @@ class GuiRolloutCtrl : public GuiTickCtrl
void setCanCollapse( bool value ) { mCanCollapse = value; }
// Control Rendering
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onAdd();
void onRender(Point2I offset, const RectI &updateRect) override;
bool onAdd() override;
};
#endif // _GUI_ROLLOUTCTRL_H_

30
Engine/source/gui/containers/guiScrollCtrl.h
View file

@ -219,9 +219,9 @@ class GuiScrollCtrl : public GuiContainer
// you can change the bitmap array dynamically.
void loadBitmapArray();
void addObject(SimObject *obj);
bool resize(const Point2I &newPosition, const Point2I &newExtent);
void childResized(GuiControl *child);
void addObject(SimObject *obj) override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void childResized(GuiControl *child) override;
Point2I getChildPos() { return mChildPos; }
Point2I getChildRelPos() { return mChildRelPos; };
Point2I getChildExtent() { return mChildExt; }
@ -244,24 +244,24 @@ class GuiScrollCtrl : public GuiContainer
Region getCurHitRegion(void) { return mHitRegion; }
// GuiControl
virtual bool onKeyDown(const GuiEvent &event);
virtual void onMouseDown(const GuiEvent &event);
virtual bool onMouseDownEditor( const GuiEvent& event, Point2I offset );
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
virtual bool onMouseWheelUp(const GuiEvent &event);
virtual bool onMouseWheelDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
bool onMouseDownEditor( const GuiEvent& event, Point2I offset ) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
bool onMouseWheelUp(const GuiEvent &event) override;
bool onMouseWheelDown(const GuiEvent &event) override;
virtual bool onWake();
virtual void onSleep();
bool onWake() override;
void onSleep() override;
virtual void onPreRender();
virtual void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void drawBorder(const Point2I &offset, bool isFirstResponder);
virtual void drawVScrollBar(const Point2I &offset);
virtual void drawHScrollBar(const Point2I &offset);
virtual void drawScrollCorner(const Point2I &offset);
virtual GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1);
GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1) override;
static void initPersistFields();

14
Engine/source/gui/containers/guiStackCtrl.h
View file

@ -73,14 +73,14 @@ public:
vertStackBottom, ///< Stack from bottom to top when vertical
};
bool resize(const Point2I &newPosition, const Point2I &newExtent);
void childResized(GuiControl *child);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void childResized(GuiControl *child) override;
bool isFrozen() { return mResizing; };
/// prevent resizing. useful when adding many items.
void freeze(bool);
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
void updatePanes();
@ -89,10 +89,10 @@ public:
S32 getCount() { return size(); }; /// Returns the number of children in the stack
void addObject(SimObject *obj);
void removeObject(SimObject *obj);
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
bool reOrder(SimObject* obj, SimObject* target = 0);
bool reOrder(SimObject* obj, SimObject* target = 0) override;
static void initPersistFields();

2
Engine/source/gui/controls/guiBackgroundCtrl.h
View file

@ -42,7 +42,7 @@ public:
GuiBackgroundCtrl();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
};
#endif

8
Engine/source/gui/controls/guiBitmapCtrl.h
View file

@ -63,13 +63,13 @@ class GuiBitmapCtrl : public GuiControl
void setBitmapHandle(GFXTexHandle handle, bool resize = false);
// GuiControl.
bool onWake();
void onSleep();
void inspectPostApply();
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
void updateSizing();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
void setValue(S32 x, S32 y);
DECLARE_CONOBJECT( GuiBitmapCtrl );

34
Engine/source/gui/controls/guiPopUpCtrl.h
View file

@ -50,7 +50,7 @@ protected:
GuiPopupTextListCtrl *mTextList;
public:
GuiPopUpBackgroundCtrl(GuiPopUpMenuCtrl *ctrl, GuiPopupTextListCtrl* textList);
void onMouseDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
};
class GuiPopupTextListCtrl : public GuiTextListCtrl
@ -66,12 +66,12 @@ public:
GuiPopupTextListCtrl(GuiPopUpMenuCtrl *ctrl);
// GuiArrayCtrl overload:
void onCellSelected(Point2I cell);
void onCellSelected(Point2I cell) override;
// GuiControl overloads:
bool onKeyDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
bool onKeyDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
};
class GuiPopUpMenuCtrl : public GuiTextCtrl
@ -141,26 +141,26 @@ public:
GuiPopUpMenuCtrl(void);
~GuiPopUpMenuCtrl();
GuiScrollCtrl::Region mScrollDir;
bool onWake(); // Added
bool onAdd();
void onSleep();
bool onWake() override; // Added
bool onAdd() override;
void onSleep() override;
void setBitmap(const char *name); // Added
void sort();
void sortID(); // Added
void addEntry(const char *buf, S32 id = -1, U32 scheme = 0);
void addScheme(U32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL);
void onRender(Point2I offset, const RectI &updateRect);
void onAction();
void onRender(Point2I offset, const RectI &updateRect) override;
void onAction() override;
virtual void closePopUp();
void clear();
void clear() override;
void clearEntry( S32 entry ); // Added
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseEnter(const GuiEvent &event); // Added
void onMouseLeave(const GuiEvent &); // Added
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override; // Added
void onMouseLeave(const GuiEvent &) override; // Added
void setupAutoScroll(const GuiEvent &event);
void autoScroll();
bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void reverseTextList();
bool getFontColor(ColorI &fontColor, S32 id, bool selected, bool mouseOver);
bool getColoredBox(ColorI &boxColor, S32 id); // Added
@ -170,7 +170,7 @@ public:
void setSelected(S32 id, bool bNotifyScript = true);
void setFirstSelected(bool bNotifyScript = true); // Added
void setNoneSelected(); // Added
const char *getScriptValue();
const char *getScriptValue() override;
const char *getTextById(S32 id);
S32 findText( const char* text );
S32 getNumEntries() { return( mEntries.size() ); }

38
Engine/source/gui/controls/guiPopUpCtrlEx.h
View file

@ -48,7 +48,7 @@ protected:
GuiPopupTextListCtrlEx *mTextList;
public:
GuiPopUpBackgroundCtrlEx(GuiPopUpMenuCtrlEx *ctrl, GuiPopupTextListCtrlEx* textList);
void onMouseDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
};
class GuiPopupTextListCtrlEx : public GuiTextListCtrl
@ -66,13 +66,13 @@ class GuiPopupTextListCtrlEx : public GuiTextListCtrl
GuiPopupTextListCtrlEx(GuiPopUpMenuCtrlEx *ctrl);
// GuiArrayCtrl overload:
void onCellSelected(Point2I cell);
void onCellSelected(Point2I cell) override;
// GuiControl overloads:
bool onKeyDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseMove(const GuiEvent &event);
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
bool onKeyDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
};
class GuiPopUpMenuCtrlEx : public GuiTextCtrl
@ -150,10 +150,10 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
GuiPopUpMenuCtrlEx(void);
~GuiPopUpMenuCtrlEx();
GuiScrollCtrl::Region mScrollDir;
virtual bool onWake(); // Added
virtual void onRemove();
virtual bool onAdd();
virtual void onSleep();
bool onWake() override; // Added
void onRemove() override;
bool onAdd() override;
void onSleep() override;
void setBitmap(const char *name); // Added
void sort();
void sortID(); // Added
@ -163,18 +163,18 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
addEntry(buf, -2, 0);
}
void addScheme(U32 id, ColorI fontColor, ColorI fontColorHL, ColorI fontColorSEL);
void onRender(Point2I offset, const RectI &updateRect);
void onAction();
void onRender(Point2I offset, const RectI &updateRect) override;
void onAction() override;
virtual void closePopUp();
void clear();
void clear() override;
void clearEntry( S32 entry ); // Added
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseEnter(const GuiEvent &event); // Added
void onMouseLeave(const GuiEvent &); // Added
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override; // Added
void onMouseLeave(const GuiEvent &) override; // Added
void setupAutoScroll(const GuiEvent &event);
void autoScroll();
bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void reverseTextList();
bool getFontColor(ColorI &fontColor, S32 id, bool selected, bool mouseOver);
bool getColoredBox(ColorI &boxColor, S32 id); // Added
@ -183,7 +183,7 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
void setSelected(S32 id, bool bNotifyScript = true);
void setFirstSelected(bool bNotifyScript = true); // Added
void setNoneSelected(); // Added
const char *getScriptValue();
const char *getScriptValue() override;
const char *getTextById(S32 id);
S32 findText( const char* text );
S32 getNumEntries() { return( mEntries.size() ); }

14
Engine/source/gui/controls/guiTextCtrl.h
View file

@ -59,8 +59,8 @@ public:
static void initPersistFields();
//Parental methods
bool onAdd();
virtual bool onWake();
bool onAdd() override;
bool onWake() override;
//text methods
virtual void setText(const char *txt = NULL);
@ -75,18 +75,18 @@ public:
{ return static_cast<GuiTextCtrl*>(obj)->getText(); }
void inspectPostApply();
void inspectPostApply() override;
//rendering methods
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
void displayText( S32 xOffset, S32 yOffset );
// resizing
void autoResize();
//Console methods
const char *getScriptValue();
void setScriptValue(const char *value);
const char *getScriptValue() override;
void setScriptValue(const char *value) override;
};
#endif //_GUI_TEXT_CONTROL_H_

26
Engine/source/gui/controls/guiTextEditCtrl.h
View file

@ -112,7 +112,7 @@ public:
DECLARE_DESCRIPTION( "A control that allows to edit a single line of text. ");
static void initPersistFields();
bool onAdd();
bool onAdd() override;
/// Get the contents of the control.
///
@ -121,7 +121,7 @@ public:
virtual void getRenderText(char *dest);
void setText(S32 tag);
virtual void setText(const UTF8* txt);
void setText(const UTF8* txt) override;
virtual void setText(const UTF16* txt);
S32 getCursorPos() { return( mCursorPos ); }
void setCursorPos( const S32 newPos );
@ -136,30 +136,30 @@ public:
void clearSelectedText();
void forceValidateText();
const char *getScriptValue();
void setScriptValue(const char *value);
const char *getScriptValue() override;
void setScriptValue(const char *value) override;
bool getSinkAllKeys() { return mSinkAllKeyEvents; }
void setSinkAllKeys(bool state) { mSinkAllKeyEvents = state; }
virtual bool onKeyDown(const GuiEvent &event);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onCopy(bool andCut);
void onPaste();
void onUndo();
virtual void setFirstResponder();
virtual void onLoseFirstResponder();
void setFirstResponder() override;
void onLoseFirstResponder() override;
bool hasText();
void onStaticModified(const char* slotName, const char* newValue = NULL);
void onStaticModified(const char* slotName, const char* newValue = NULL) override;
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void drawText( const RectI &drawRect, bool isFocused );
bool dealWithEnter( bool clearResponder );

18
Engine/source/gui/controls/guiTextEditSliderCtrl.h
View file

@ -57,22 +57,22 @@ public:
virtual void getText(char *dest); // dest must be of size
// StructDes::MAX_STRING_LEN + 1
virtual void setText(const char *txt);
void setText(const char *txt) override;
void setValue();
void checkRange();
void checkIncValue();
void timeInc(U32 elapseTime);
virtual bool onKeyDown(const GuiEvent &event);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual bool onMouseWheelUp(const GuiEvent &event);
virtual bool onMouseWheelDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
bool onMouseWheelUp(const GuiEvent &event) override;
bool onMouseWheelDown(const GuiEvent &event) override;
virtual void onPreRender();
virtual void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
protected:

24
Engine/source/gui/controls/guiTextListCtrl.h
View file

@ -59,8 +59,8 @@ class GuiTextListCtrl : public GuiArrayCtrl
S32 mRowHeightPadding;
U32 getRowWidth(Entry *row);
bool cellSelected(Point2I cell);
void onCellSelected(Point2I cell);
bool cellSelected(Point2I cell) override;
void onCellSelected(Point2I cell) override;
public:
GuiTextListCtrl();
@ -77,12 +77,12 @@ class GuiTextListCtrl : public GuiArrayCtrl
virtual void setCellSize( const Point2I &size ){ mCellSize = size; }
virtual void getCellSize( Point2I &size ){ size = mCellSize; }
const char *getScriptValue();
void setScriptValue(const char *value);
const char *getScriptValue() override;
void setScriptValue(const char *value) override;
U32 getNumEntries();
void clear();
void clear() override;
virtual void addEntry(U32 id, const char *text);
virtual void insertEntry(U32 id, const char *text, S32 index);
void setEntry(U32 id, const char *text);
@ -93,7 +93,7 @@ class GuiTextListCtrl : public GuiArrayCtrl
U32 getEntryId(U32 index);
bool onWake();
bool onWake() override;
void removeEntry(U32 id);
virtual void removeEntryByIndex(S32 id);
virtual void sort(U32 column, bool increasing = true);
@ -103,14 +103,14 @@ class GuiTextListCtrl : public GuiArrayCtrl
U32 getSelectedRow();
const char *getSelectedText();
bool onKeyDown(const GuiEvent &event);
bool onGamepadAxisUp(const GuiEvent& event);
bool onGamepadAxisDown(const GuiEvent& event);
bool onKeyDown(const GuiEvent &event) override;
bool onGamepadAxisUp(const GuiEvent& event) override;
bool onGamepadAxisDown(const GuiEvent& event) override;
virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
void setSize(Point2I newSize);
void onRemove();
void setSize(Point2I newSize) override;
void onRemove() override;
void addColumnOffset(S32 offset) { mColumnOffsets.push_back(offset); }
void clearColumnOffsets() { mColumnOffsets.clear(); }
};

32
Engine/source/gui/controls/guiTreeViewCtrl.h
View file

@ -596,20 +596,20 @@ class GuiTreeViewCtrl : public GuiArrayCtrl
/// @}
// GuiControl
bool onAdd();
bool onWake();
void onSleep();
void onPreRender();
bool onKeyDown( const GuiEvent &event );
void onMouseDown(const GuiEvent &event);
void onMiddleMouseDown(const GuiEvent &event);
void onMouseMove(const GuiEvent &event);
void onMouseEnter(const GuiEvent &event);
void onMouseLeave(const GuiEvent &event);
void onRightMouseDown(const GuiEvent &event);
void onRightMouseUp(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
bool onAdd() override;
bool onWake() override;
void onSleep() override;
void onPreRender() override;
bool onKeyDown( const GuiEvent &event ) override;
void onMouseDown(const GuiEvent &event) override;
void onMiddleMouseDown(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onRightMouseDown(const GuiEvent &event) override;
void onRightMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
/// Returns false if the object is a child of one of the inner items.
bool childSearch(Item * item, SimObject *obj, bool yourBaby);
@ -622,8 +622,8 @@ class GuiTreeViewCtrl : public GuiArrayCtrl
bool objectSearch( const SimObject *object, Item **item );
// GuiArrayCtrl
void onRenderCell(Point2I offset, Point2I cell, bool, bool);
void onRender(Point2I offset, const RectI &updateRect);
void onRenderCell(Point2I offset, Point2I cell, bool, bool) override;
void onRender(Point2I offset, const RectI &updateRect) override;
bool renderTooltip( const Point2I &hoverPos, const Point2I& cursorPos, const char* tipText );

22
Engine/source/gui/core/guiArrayCtrl.h
View file

@ -64,8 +64,8 @@ public:
GuiArrayCtrl();
DECLARE_CONOBJECT(GuiArrayCtrl);
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
/// @name Array attribute methods
/// @{
@ -89,19 +89,19 @@ public:
virtual void onRenderColumnHeaders(Point2I offset, Point2I parentOffset, Point2I headerDim);
virtual void onRenderRowHeader(Point2I offset, Point2I parentOffset, Point2I headerDim, Point2I cell);
virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
/// @}
/// @name Mouse input methods
/// @{
void onMouseDown( const GuiEvent &event );
void onMouseUp( const GuiEvent &event );
void onMouseMove( const GuiEvent &event );
void onMouseDragged( const GuiEvent &event );
void onMouseEnter( const GuiEvent &event );
void onMouseLeave( const GuiEvent &event );
bool onKeyDown( const GuiEvent &event );
void onRightMouseDown( const GuiEvent &event );
void onMouseDown( const GuiEvent &event ) override;
void onMouseUp( const GuiEvent &event ) override;
void onMouseMove( const GuiEvent &event ) override;
void onMouseDragged( const GuiEvent &event ) override;
void onMouseEnter( const GuiEvent &event ) override;
void onMouseLeave( const GuiEvent &event ) override;
bool onKeyDown( const GuiEvent &event ) override;
void onRightMouseDown( const GuiEvent &event ) override;
/// @}
};

8
Engine/source/gui/core/guiCanvas.h
View file

@ -220,8 +220,8 @@ public:
GuiCanvas();
virtual ~GuiCanvas();
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
#ifdef TORQUE_TOOLS
void setMenuBar(SimObject *obj);
SimObject* getMenuBar() { return mMenuBarCtrl; }
@ -373,7 +373,7 @@ public:
/// Processes an input event
/// @see InputEvent
/// @param event Input event to process
virtual bool processInputEvent(InputEventInfo &inputEvent);
bool processInputEvent(InputEventInfo &inputEvent) override;
/// @}
/// @name Mouse Methods
@ -450,7 +450,7 @@ public:
/// Sets the first responder.
/// @param firstResponder Control to designate as first responder
virtual void setFirstResponder(GuiControl *firstResponder);
void setFirstResponder(GuiControl *firstResponder) override;
/// This is used to toggle processing of native OS accelerators, not
/// to be confused with the Torque accelerator key system, to keep them

26
Engine/source/gui/core/guiControl.h
View file

@ -327,7 +327,7 @@ class GuiControl : public SimGroup
void setSizing(S32 horz, S32 vert);
/// Overrides Parent Serialization to allow specific controls to not be saved (Dynamic Controls, etc)
void write(Stream &stream, U32 tabStop, U32 flags);
void write(Stream &stream, U32 tabStop, U32 flags) override;
/// Returns boolean as to whether any parent of this control has the 'no serialization' flag set.
bool getCanSaveParent();
@ -343,7 +343,7 @@ class GuiControl : public SimGroup
GuiControl();
virtual ~GuiControl();
virtual bool processArguments(S32 argc, ConsoleValue *argv);
bool processArguments(S32 argc, ConsoleValue *argv) override;
static void initPersistFields();
static void consoleInit();
@ -382,8 +382,8 @@ class GuiControl : public SimGroup
/// @param value True if object should be visible
virtual void setVisible(bool value);
inline bool isVisible() const { return mVisible; } ///< Returns true if the object is visible
virtual bool isHidden() const { return !isVisible(); }
virtual void setHidden( bool state ) { setVisible( !state ); }
bool isHidden() const override { return !isVisible(); }
void setHidden( bool state ) override { setVisible( !state ); }
void setCanHit( bool value ) { mCanHit = value; }
@ -413,18 +413,18 @@ class GuiControl : public SimGroup
/// Adds an object as a child of this object.
/// @param obj New child object of this control
void addObject(SimObject *obj);
void addObject(SimObject *obj) override;
/// Removes a child object from this control.
/// @param obj Object to remove from this control
void removeObject(SimObject *obj);
void removeObject(SimObject *obj) override;
GuiControl *getParent(); ///< Returns the control which owns this one.
GuiCanvas *getRoot(); ///< Returns the root canvas of this control.
virtual bool acceptsAsChild( SimObject* object ) const;
bool acceptsAsChild( SimObject* object ) const override;
virtual void onGroupRemove();
void onGroupRemove() override;
/// @}
@ -535,16 +535,16 @@ class GuiControl : public SimGroup
virtual void onPreRender();
/// Called when this object is removed
virtual void onRemove();
void onRemove() override;
/// Called when one of this objects children is removed
virtual void onChildRemoved( GuiControl *child );
/// Called when this object is added to the scene
virtual bool onAdd();
bool onAdd() override;
/// Called when the mProfile or mToolTipProfile is deleted
virtual void onDeleteNotify(SimObject *object);
void onDeleteNotify(SimObject *object) override;
/// Called when this object has a new child
virtual void onChildAdded( GuiControl *child );
@ -828,8 +828,8 @@ class GuiControl : public SimGroup
/// of the final clipped text in pixels.
U32 clipText( String &inOutText, U32 width ) const;
void inspectPostApply();
void inspectPreApply();
void inspectPostApply() override;
void inspectPreApply() override;
protected:
F32 fade_amt;
public:

16
Engine/source/gui/core/guiOffscreenCanvas.h
View file

@ -19,18 +19,18 @@ public:
GuiOffscreenCanvas();
~GuiOffscreenCanvas();
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
void renderFrame(bool preRenderOnly, bool bufferSwap);
void renderFrame(bool preRenderOnly, bool bufferSwap) override;
virtual void onFrameRendered();
Point2I getWindowSize();
Point2I getWindowSize() override;
Point2I getCursorPos();
void setCursorPos(const Point2I &pt);
void showCursor(bool state);
bool isCursorShown();
Point2I getCursorPos() override;
void setCursorPos(const Point2I &pt) override;
void showCursor(bool state) override;
bool isCursorShown() override;
void _onTextureEvent( GFXTexCallbackCode code );

10
Engine/source/gui/core/guiTypes.h
View file

@ -364,8 +364,8 @@ public:
~GuiCursor(void);
static void initPersistFields();
bool onAdd(void);
void onRemove();
bool onAdd(void) override;
void onRemove() override;
void render(const Point2I &pos);
void onImageChanged() {}
@ -601,12 +601,12 @@ public:
~GuiControlProfile();
static void initPersistFields();
bool onAdd();
bool onAdd() override;
void onStaticModified(const char* slotName, const char* newValue = NULL );
void onStaticModified(const char* slotName, const char* newValue = NULL ) override;
/// Called when mProfileForChildren is deleted
virtual void onDeleteNotify(SimObject *object);
void onDeleteNotify(SimObject *object) override;
/// This method creates an array of bitmaps from one single bitmap with
/// separator color. The separator color is whatever color is in pixel 0,0

20
Engine/source/gui/editor/guiInspector.h
View file

@ -51,18 +51,18 @@ public:
static void initPersistFields();
// SimObject
virtual void onRemove();
virtual void onDeleteNotify( SimObject *object );
void onRemove() override;
void onDeleteNotify( SimObject *object ) override;
// GuiControl
virtual void parentResized( const RectI &oldParentRect, const RectI &newParentRect );
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual GuiControl* findHitControl( const Point2I &pt, S32 initialLayer );
virtual void getCursor( GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent );
virtual void onMouseMove( const GuiEvent &event );
virtual void onMouseDown( const GuiEvent &event );
virtual void onMouseUp( const GuiEvent &event );
virtual void onMouseDragged( const GuiEvent &event );
void parentResized( const RectI &oldParentRect, const RectI &newParentRect ) override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
GuiControl* findHitControl( const Point2I &pt, S32 initialLayer ) override;
void getCursor( GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent ) override;
void onMouseMove( const GuiEvent &event ) override;
void onMouseDown( const GuiEvent &event ) override;
void onMouseUp( const GuiEvent &event ) override;
void onMouseDragged( const GuiEvent &event ) override;
// GuiInspector

144
Engine/source/gui/editor/guiInspectorTypes.h
View file

@ -62,8 +62,8 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual void setValue( StringTableEntry newValue );
GuiControl* constructEditControl() override;
void setValue( StringTableEntry newValue ) override;
virtual void _populateMenu( GuiPopUpMenuCtrlEx *menu );
};
@ -78,7 +78,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeEnum);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
};
//-----------------------------------------------------------------------------
@ -92,7 +92,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeCubemapName);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
};
//--------------------------------------------------------------------------------
@ -119,8 +119,8 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
class GuiInspectorTypeRegularMaterialName : public GuiInspectorTypeMaterialName
@ -150,7 +150,7 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
};
//--------------------------------------------------------------------------------
@ -170,7 +170,7 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
};
//-----------------------------------------------------------------------------
@ -184,7 +184,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeGuiProfile);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
};
//-----------------------------------------------------------------------------
@ -198,7 +198,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeActionMap);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx * menu);
void _populateMenu(GuiPopUpMenuCtrlEx * menu) override;
};
//-----------------------------------------------------------------------------
@ -215,9 +215,9 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual void setValue( StringTableEntry newValue );
virtual const char* getValue();
GuiControl* constructEditControl() override;
void setValue( StringTableEntry newValue ) override;
const char* getValue() override;
};
//-----------------------------------------------------------------------------
@ -237,8 +237,8 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual void setValue( StringTableEntry data );
GuiControl* constructEditControl() override;
void setValue( StringTableEntry data ) override;
};
//-----------------------------------------------------------------------------
@ -258,10 +258,10 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual bool updateRects();
virtual void updateValue();
GuiControl* constructEditControl() override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
bool updateRects() override;
void updateValue() override;
};
@ -276,7 +276,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeImageFileName);
static void consoleInit();
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
bool renderTooltip( const Point2I &hoverPos, const Point2I &cursorPos, const char *tipText = NULL );
};
@ -298,8 +298,8 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -328,9 +328,9 @@ class GuiInspectorTypeEaseF : public GuiInspectorField
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -344,7 +344,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypePrefabFilename);
static void consoleInit();
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
};
//-----------------------------------------------------------------------------
@ -360,8 +360,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeShapeFilename);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -394,9 +394,9 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -408,7 +408,7 @@ class GuiInspectorTypeColorI : public GuiInspectorTypeColor
protected:
virtual const char* _getColorConversionFunction() const { return "ColorFloatToInt"; }
const char* _getColorConversionFunction() const override { return "ColorFloatToInt"; }
public:
@ -417,7 +417,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeColorI);
static void consoleInit();
void setValue( StringTableEntry newValue );
void setValue( StringTableEntry newValue ) override;
};
//-----------------------------------------------------------------------------
@ -434,7 +434,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeColorF);
static void consoleInit();
void setValue( StringTableEntry newValue );
void setValue( StringTableEntry newValue ) override;
};
/* NOTE: Evidently this isn't used anywhere (or implemented) so i commented it out
@ -469,8 +469,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeS32);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual void setValue( StringTableEntry newValue );
GuiControl* constructEditControl() override;
void setValue( StringTableEntry newValue ) override;
};
@ -492,16 +492,16 @@ public:
DECLARE_CONOBJECT( GuiInspectorTypeBitMask32 );
// ConsoleObject
bool onAdd();
bool onAdd() override;
static void consoleInit();
// GuiInspectorField
virtual void childResized( GuiControl *child );
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual bool updateRects();
virtual void updateData();
virtual StringTableEntry getValue();
virtual void setValue( StringTableEntry value );
void childResized( GuiControl *child ) override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
bool updateRects() override;
void updateData() override;
StringTableEntry getValue() override;
void setValue( StringTableEntry value ) override;
protected:
@ -529,10 +529,10 @@ public:
//-----------------------------------------------------------------------------
// Override able methods for custom edit fields
//-----------------------------------------------------------------------------
virtual GuiControl* constructEditControl();
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual bool updateRects();
virtual void setValue( StringTableEntry value );
GuiControl* constructEditControl() override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
bool updateRects() override;
void setValue( StringTableEntry value ) override;
};
@ -547,7 +547,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeName);
static void consoleInit();
virtual bool verifyData( StringTableEntry data );
bool verifyData( StringTableEntry data ) override;
};
@ -562,7 +562,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeSFXParameterName);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
};
@ -577,7 +577,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeSFXStateName);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
};
@ -592,7 +592,7 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeSFXSourceName);
static void consoleInit();
virtual void _populateMenu(GuiPopUpMenuCtrlEx *menu );
void _populateMenu(GuiPopUpMenuCtrlEx *menu ) override;
};
//-----------------------------------------------------------------------------
@ -620,9 +620,9 @@ public:
GuiButtonCtrl* mPasteButton;
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
virtual void updateValue();
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
virtual bool updateRects();
void updateValue() override;
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -641,10 +641,10 @@ protected:
public:
GuiTextCtrl* mDimensionLabelZ;
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
virtual void updateValue();
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
virtual bool updateRects();
void constructEditControlChildren(GuiControl* retCtrl, S32 width) override;
void updateValue() override;
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -661,10 +661,10 @@ protected:
public:
GuiTextCtrl* mDimensionLabelW;
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
virtual void updateValue();
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
virtual bool updateRects();
void constructEditControlChildren(GuiControl* retCtrl, S32 width) override;
void updateValue() override;
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
bool updateRects() override;
};
//-----------------------------------------------------------------------------
@ -678,7 +678,7 @@ private:
public:
DECLARE_CONOBJECT(GuiInspectorTypePoint2F);
static void consoleInit();
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
};
class GuiInspectorTypePoint2I : public GuiInspectorTypePoint2F
@ -688,7 +688,7 @@ private:
public:
DECLARE_CONOBJECT(GuiInspectorTypePoint2I);
static void consoleInit();
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
};
@ -704,7 +704,7 @@ private:
public:
DECLARE_CONOBJECT(GuiInspectorTypePoint3F);
static void consoleInit();
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
};
//-----------------------------------------------------------------------------
@ -721,16 +721,16 @@ public:
EulerF eulAng;
DECLARE_CONOBJECT(GuiInspectorTypeMatrixRotation);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual void constructEditControlChildren(GuiControl* retCtrl, S32 width);
virtual void updateValue();
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
virtual bool updateRects();
GuiControl* constructEditControl() override;
void constructEditControlChildren(GuiControl* retCtrl, S32 width) override;
void updateValue() override;
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
bool updateRects() override;
void updateAng(AngAxisF newAngAx);
void updateEul(EulerF newEul);
virtual void updateData();
virtual StringTableEntry getValue();
void updateData() override;
StringTableEntry getValue() override;
};
#endif // _GUI_INSPECTOR_TYPES_H_

12
Engine/source/gui/editor/inspector/field.h
View file

@ -202,12 +202,12 @@ class GuiInspectorField : public GuiControl
GuiInspector* getInspector() const { return mInspector; }
// GuiControl.
virtual bool onAdd();
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual void onRender(Point2I offset, const RectI &updateRect);
virtual void setFirstResponder( GuiControl *firstResponder );
virtual void onMouseDown( const GuiEvent &event );
virtual void onRightMouseUp( const GuiEvent &event );
bool onAdd() override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void onRender(Point2I offset, const RectI &updateRect) override;
void setFirstResponder( GuiControl *firstResponder ) override;
void onMouseDown( const GuiEvent &event ) override;
void onRightMouseUp( const GuiEvent &event ) override;
void setTargetObject(SimObject* obj) { mTargetObject = obj; }
SimObject* getTargetObject() { return mTargetObject; }

2
Engine/source/gui/editor/inspector/group.h
View file

@ -70,7 +70,7 @@ public:
const String& getGroupName() const { return mCaption; };
SimObjectPtr<GuiInspector> getInspector() { return mParent; };
bool onAdd();
bool onAdd() override;
virtual bool inspectGroup();
virtual void animateToContents();

6
Engine/source/gui/shiny/guiTickCtrl.h
View file

@ -53,9 +53,9 @@ private:
protected:
// So this can be instantiated and not be a pure virtual class
virtual void interpolateTick( F32 delta ) {};
virtual void processTick() {};
virtual void advanceTime( F32 timeDelta ) {};
void interpolateTick( F32 delta ) override {};
void processTick() override {};
void advanceTime( F32 timeDelta ) override {};
public:
DECLARE_CONOBJECT( GuiTickCtrl );

44
Engine/source/gui/worldEditor/editTSCtrl.h
View file

@ -48,22 +48,22 @@ class EditTSCtrl : public GuiTSCtrl
void make3DMouseEvent(Gui3DMouseEvent & gui3Devent, const GuiEvent &event);
// GuiControl
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
virtual void onMouseUp(const GuiEvent & event);
virtual void onMouseDown(const GuiEvent & event);
virtual void onMouseMove(const GuiEvent & event);
virtual void onMouseDragged(const GuiEvent & event);
virtual void onMouseEnter(const GuiEvent & event);
virtual void onMouseLeave(const GuiEvent & event);
virtual void onRightMouseDown(const GuiEvent & event);
virtual void onRightMouseUp(const GuiEvent & event);
virtual void onRightMouseDragged(const GuiEvent & event);
virtual void onMiddleMouseDown(const GuiEvent & event);
virtual void onMiddleMouseUp(const GuiEvent & event);
virtual void onMiddleMouseDragged(const GuiEvent & event);
virtual bool onInputEvent(const InputEventInfo & event);
virtual bool onMouseWheelUp(const GuiEvent &event);
virtual bool onMouseWheelDown(const GuiEvent &event);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
void onMouseUp(const GuiEvent & event) override;
void onMouseDown(const GuiEvent & event) override;
void onMouseMove(const GuiEvent & event) override;
void onMouseDragged(const GuiEvent & event) override;
void onMouseEnter(const GuiEvent & event) override;
void onMouseLeave(const GuiEvent & event) override;
void onRightMouseDown(const GuiEvent & event) override;
void onRightMouseUp(const GuiEvent & event) override;
void onRightMouseDragged(const GuiEvent & event) override;
void onMiddleMouseDown(const GuiEvent & event) override;
void onMiddleMouseUp(const GuiEvent & event) override;
void onMiddleMouseDragged(const GuiEvent & event) override;
bool onInputEvent(const InputEventInfo & event) override;
bool onMouseWheelUp(const GuiEvent &event) override;
bool onMouseWheelDown(const GuiEvent &event) override;
virtual void updateGuiInfo() {};
@ -73,7 +73,7 @@ class EditTSCtrl : public GuiTSCtrl
virtual void renderGrid();
// GuiTSCtrl
void renderWorld(const RectI & updateRect);
void renderWorld(const RectI & updateRect) override;
void _renderScene(ObjectRenderInst*, SceneRenderState *state, BaseMatInstance*);
@ -124,8 +124,8 @@ class EditTSCtrl : public GuiTSCtrl
~EditTSCtrl();
// SimObject
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
//
bool mRenderMissionArea;
@ -172,10 +172,10 @@ class EditTSCtrl : public GuiTSCtrl
// GuiTSCtrl
virtual bool getCameraTransform(MatrixF* cameraMatrix);
virtual void computeSceneBounds(Box3F& bounds);
bool processCameraQuery(CameraQuery * query);
bool processCameraQuery(CameraQuery * query) override;
// guiControl
virtual void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
virtual void on3DMouseUp(const Gui3DMouseEvent &){};
virtual void on3DMouseDown(const Gui3DMouseEvent &){};
virtual void on3DMouseMove(const Gui3DMouseEvent &){};
@ -191,7 +191,7 @@ class EditTSCtrl : public GuiTSCtrl
virtual bool isMiddleMouseDown() {return mMiddleMouseDown;}
virtual bool resize(const Point2I& newPosition, const Point2I& newExtent);
bool resize(const Point2I& newPosition, const Point2I& newExtent) override;
S32 getDisplayType() const {return mDisplayType;}
virtual void setDisplayType(S32 type);

6
Engine/source/gui/worldEditor/editor.h
View file

@ -43,11 +43,11 @@ class EditManager : public GuiControl
EditManager();
~EditManager();
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
// SimObject
bool onAdd();
bool onAdd() override;
/// Perform the onEditorEnabled callback on all SimObjects
/// and set gEditingMission true.

6
Engine/source/gui/worldEditor/gizmo.h
View file

@ -80,7 +80,7 @@ public:
DECLARE_CONOBJECT( GizmoProfile );
virtual bool onAdd();
bool onAdd() override;
static void initPersistFields();
static void consoleInit();
@ -192,8 +192,8 @@ public:
DECLARE_CONOBJECT( Gizmo );
// SimObject
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
// Mutators

30
Engine/source/gui/worldEditor/worldEditor.h
View file

@ -150,8 +150,8 @@ class WorldEditor : public EditTSCtrl
Vector<Entry> mEntries;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
void submitUndo( Selection* sel, const UTF8* label="World Editor Action" );
@ -389,7 +389,7 @@ class WorldEditor : public EditTSCtrl
S32 mCurrentCursor;
void setCursor(U32 cursor);
void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event);
void get3DCursor(GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event) override;
public:
@ -399,23 +399,23 @@ class WorldEditor : public EditTSCtrl
void setDirty() { mIsDirty = true; }
// SimObject
virtual bool onAdd();
virtual void onEditorEnable();
bool onAdd() override;
void onEditorEnable() override;
// EditTSCtrl
void on3DMouseMove(const Gui3DMouseEvent & event);
void on3DMouseDown(const Gui3DMouseEvent & event);
void on3DMouseUp(const Gui3DMouseEvent & event);
void on3DMouseDragged(const Gui3DMouseEvent & event);
void on3DMouseEnter(const Gui3DMouseEvent & event);
void on3DMouseLeave(const Gui3DMouseEvent & event);
void on3DRightMouseDown(const Gui3DMouseEvent & event);
void on3DRightMouseUp(const Gui3DMouseEvent & event);
void on3DMouseMove(const Gui3DMouseEvent & event) override;
void on3DMouseDown(const Gui3DMouseEvent & event) override;
void on3DMouseUp(const Gui3DMouseEvent & event) override;
void on3DMouseDragged(const Gui3DMouseEvent & event) override;
void on3DMouseEnter(const Gui3DMouseEvent & event) override;
void on3DMouseLeave(const Gui3DMouseEvent & event) override;
void on3DRightMouseDown(const Gui3DMouseEvent & event) override;
void on3DRightMouseUp(const Gui3DMouseEvent & event) override;
void updateGuiInfo();
void updateGuiInfo() override;
//
void renderScene(const RectI & updateRect);
void renderScene(const RectI & updateRect) override;
static void initPersistFields();