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

rest of virtuals removed

Browse source 
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:40:22 +00:00
parent efbe5e90f5
commit 2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/buttons/guiBorderButton.cpp
View file

@ -37,7 +37,7 @@ protected:
public:
DECLARE_CONOBJECT(GuiBorderButtonCtrl);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
};
IMPLEMENT_CONOBJECT(GuiBorderButtonCtrl);

12
Engine/source/gui/buttons/guiIconButtonCtrl.h
View file

@ -103,18 +103,18 @@ public:
static void initPersistFields();
//Parent methods
bool onWake();
void onSleep();
void inspectPostApply();
void onStaticModified(const char* slotName, const char* newValue = NULL);
bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
void onStaticModified(const char* slotName, const char* newValue = NULL) override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void setBitmap(const char *name);
// Used to set the optional error bitmap
void setErrorBitmap(const char *name);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
void onImageChanged() {}
};

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

@ -57,8 +57,8 @@ class GuiSwatchButtonCtrl : public GuiButtonBaseCtrl
void setColor( const LinearColorF &color ) { mSwatchColor = color; }
// GuiButtonBaseCtrl
virtual bool onWake();
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();

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

@ -34,8 +34,8 @@ public:
DECLARE_CONOBJECT(GuiToggleButtonCtrl);
GuiToggleButtonCtrl();
virtual void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
};
#endif //_GUITOGGLEBUTTONCTRL_H_

8
Engine/source/gui/buttons/guiToolboxButtonCtrl.h
View file

@ -60,16 +60,16 @@ public:
static void initPersistFields();
//Parent methods
bool onWake();
void onSleep();
void inspectPostApply();
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
void setNormalBitmap( StringTableEntry bitmapName );
void setLoweredBitmap( StringTableEntry bitmapName );
void setHoverBitmap( StringTableEntry bitmapName );
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
};

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

@ -136,17 +136,17 @@ class GuiAutoScrollCtrl : public GuiTickCtrl
void reset();
virtual bool onWake();
virtual void onSleep();
bool onWake() override;
void onSleep() override;
virtual void onChildAdded( GuiControl* control );
virtual void onChildRemoved( GuiControl* control );
virtual bool resize( const Point2I& newPosition, const Point2I& newExtent );
virtual void childResized( GuiControl *child );
void onChildAdded( GuiControl* control ) override;
void onChildRemoved( GuiControl* control ) override;
bool resize( const Point2I& newPosition, const Point2I& newExtent ) override;
void childResized( GuiControl *child ) override;
virtual void processTick();
virtual void advanceTime( F32 timeDelta );
virtual void inspectPostApply();
void processTick() override;
void advanceTime( F32 timeDelta ) override;
void inspectPostApply() override;
static void initPersistFields();

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

@ -47,18 +47,18 @@ private:
public:
GuiControlArrayControl();
bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
bool onWake();
void onSleep();
void inspectPostApply();
bool onWake() override;
void onSleep() override;
void inspectPostApply() override;
bool updateArray();
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();
DECLARE_CONOBJECT(GuiControlArrayControl);

6
Engine/source/gui/containers/guiDragAndDropCtrl.h
View file

@ -72,9 +72,9 @@ class GuiDragAndDropControl : public GuiControl
void startDragging(Point2I offset = Point2I(0, 0));
// GuiControl.
virtual void onMouseDown(const GuiEvent& event);
virtual void onMouseDragged(const GuiEvent& event);
virtual void onMouseUp(const GuiEvent& event);
void onMouseDown(const GuiEvent& event) override;
void onMouseDragged(const GuiEvent& event) override;
void onMouseUp(const GuiEvent& event) override;
static void initPersistFields();

8
Engine/source/gui/containers/guiDynamicCtrlArrayCtrl.h
View file

@ -47,14 +47,14 @@ public:
static void initPersistFields();
// SimObject
void inspectPostApply();
void inspectPostApply() override;
// SimSet
void addObject(SimObject *obj);
void addObject(SimObject *obj) override;
// GuiControl
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;
// GuiDynamicCtrlArrayCtrl
void refresh();

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

@ -95,21 +95,21 @@ public:
void setCaption( const char* caption ) { mCaption = caption; }
void setHasMenu( bool value );
bool resize(const Point2I &newPosition, const Point2I &newExtent);
void onRender(Point2I offset, const RectI &updateRect);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void onRender(Point2I offset, const RectI &updateRect) override;
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
virtual void addObject( SimObject *object );
virtual void removeObject( SimObject* object );
virtual bool acceptsAsChild( SimObject* object ) const;
void addObject( SimObject *object ) override;
void removeObject( SimObject* object ) override;
bool acceptsAsChild( SimObject* object ) const override;
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseMove(const GuiEvent &event);
void onMouseLeave(const GuiEvent &event);
void onMouseEnter(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override;
U32 getMenuBarID();

20
Engine/source/gui/containers/guiFrameCtrl.h
View file

@ -99,17 +99,17 @@ public:
GuiFrameSetCtrl(U32 columns, U32 rows, const U32 columnOffsets[] = NULL, const U32 rowOffsets[] = NULL);
virtual ~GuiFrameSetCtrl();
void addObject(SimObject *obj);
void removeObject(SimObject *obj);
void addObject(SimObject *obj) override;
void removeObject(SimObject *obj) override;
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
bool onAdd();
void onRender(Point2I offset, const RectI &updateRect );
bool onAdd() override;
void onRender(Point2I offset, const RectI &updateRect ) override;
protected:
/* member variables */
Vector<S32> mColumnOffsets;
@ -133,7 +133,7 @@ protected:
bool hitVerticalDivider(S32 x, const Point2I &point);
bool hitHorizontalDivider(S32 y, const Point2I &point);
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
void rebalance(const Point2I &newExtent);
void computeSizes(bool balanceFrames = false);
@ -159,7 +159,7 @@ public:
void balanceFrames() { computeSizes(true); }
void updateSizes() { computeSizes(); }
bool onWake();
bool onWake() override;
private:
GuiFrameSetCtrl(const GuiFrameSetCtrl &);

16
Engine/source/gui/containers/guiPaneCtrl.h
View file

@ -97,16 +97,16 @@ class GuiPaneControl : public GuiControl
virtual void setCaptionID(const char *id);
// GuiControl.
virtual bool onWake();
bool onWake() override;
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseMove(const GuiEvent &event);
virtual void onMouseLeave(const GuiEvent &event);
virtual void onMouseEnter(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override;
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();

4
Engine/source/gui/containers/guiPanel.h
View file

@ -52,8 +52,8 @@ public:
DECLARE_CONOBJECT(GuiPanel);
// GuiControl
void onRender(Point2I offset, const RectI &updateRect);
void setVisible(bool value) { Parent::setVisible(value); setUpdateLayout( updateParent ); }
void onRender(Point2I offset, const RectI &updateRect) override;
void setVisible(bool value) override { Parent::setVisible(value); setUpdateLayout( updateParent ); }
};
/// @}

22
Engine/source/gui/containers/guiSplitContainer.h
View file

@ -68,24 +68,24 @@ public:
// ConsoleObject
static void initPersistFields();
virtual bool onAdd();
bool onAdd() override;
// GuiControl
virtual bool onWake();
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
virtual bool resize( const Point2I &newPosition, const Point2I &newExtent );
virtual void onRender(Point2I offset, const RectI &updateRect);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
bool onWake() override;
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
void onRender(Point2I offset, const RectI &updateRect) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
virtual bool layoutControls( RectI &clientRect );
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
bool layoutControls( RectI &clientRect ) override;
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
virtual inline Point2I getSplitPoint() { return mSplitPoint; };
/// The Splitters entire Client Rectangle, this takes into account padding of this control
virtual inline RectI getSplitRect() { return mSplitRect; };
virtual void solvePanelConstraints(Point2I newDragPos, GuiContainer * firstPanel, GuiContainer * secondPanel, const RectI& clientRect);
virtual Point2I getMinExtent() const;
Point2I getMinExtent() const override;
//Set the positin of the split handler
void setSplitPoint(Point2I splitPoint);

36
Engine/source/gui/containers/guiTabBookCtrl.h
View file

@ -133,18 +133,18 @@ class GuiTabBookCtrl : public GuiContainer
/// @name Control Events
/// @{
bool onWake();
void onRender( Point2I offset, const RectI &updateRect );
bool onWake() override;
void onRender( Point2I offset, const RectI &updateRect ) override;
/// @}
/// @name Child events
/// @{
void onChildRemoved( GuiControl* child );
void onChildAdded( GuiControl *child );
bool reOrder(SimObject* obj, SimObject* target);
bool acceptsAsChild( SimObject* object ) const;
void onChildRemoved( GuiControl* child ) override;
void onChildAdded( GuiControl *child ) override;
bool reOrder(SimObject* obj, SimObject* target) override;
bool acceptsAsChild( SimObject* object ) const override;
/// @}
@ -203,7 +203,7 @@ class GuiTabBookCtrl : public GuiContainer
/// @{
/// Update ourselves by hooking common GuiControl functionality.
void setUpdate();
void setUpdate() override;
/// Balance a top/bottom tab row
void balanceRow( S32 row, S32 totalTabWidth );
@ -218,7 +218,7 @@ class GuiTabBookCtrl : public GuiContainer
void calculatePageTabs();
/// Get client area of tab book
virtual const RectI getClientRect();
const RectI getClientRect() override;
/// Find the tab that was hit by the current event, if any
/// @param event The GuiEvent that caused this function call
@ -240,7 +240,7 @@ class GuiTabBookCtrl : public GuiContainer
///
/// @param newPosition The new position of the control
/// @param newExtent The new extent of the control
bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
/// Called when a child page is resized
/// This method is overridden so that we may handle resizing of our child tab
@ -248,23 +248,23 @@ class GuiTabBookCtrl : public GuiContainer
/// This ensures we keep our sizing in sync when we our children are sized or moved.
///
/// @param child A pointer to the child control that has been resized
void childResized(GuiControl *child);
void childResized(GuiControl *child) override;
/// @}
virtual bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
/// @name Mouse Events
/// @{
virtual void onMouseDown( const GuiEvent &event );
virtual void onMouseUp( const GuiEvent &event );
virtual void onMouseDragged( const GuiEvent &event );
virtual void onMouseMove( const GuiEvent &event );
virtual void onMouseLeave( const GuiEvent &event );
virtual bool onMouseDownEditor( const GuiEvent &event, Point2I offset );
virtual void onRightMouseUp( const GuiEvent& event );
void onMouseDown( const GuiEvent &event ) override;
void onMouseUp( const GuiEvent &event ) override;
void onMouseDragged( const GuiEvent &event ) override;
void onMouseMove( const GuiEvent &event ) override;
void onMouseLeave( const GuiEvent &event ) override;
bool onMouseDownEditor( const GuiEvent &event, Point2I offset ) override;
void onRightMouseUp( const GuiEvent& event ) override;
/// @}
};

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

@ -214,26 +214,26 @@ class GuiWindowCtrl : public GuiContainer
bool isMinimized(S32 &index);
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
void setFont(S32 fntTag);
void setCloseCommand(const char *newCmd);
GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 );
GuiControl* findHitControl (const Point2I &pt, S32 initialLayer = -1 ) override;
S32 findHitEdges( const Point2I &globalPoint );
void getSnappableWindows( Vector<GuiWindowCtrl*> &windowOutVector, bool canCollapse = false );
bool resize( const Point2I &newPosition, const Point2I &newExtent );
bool resize( const Point2I &newPosition, const Point2I &newExtent ) override;
//only cycle tabs through the current window, so overwrite the method
GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true);
GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true);
GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override;
GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override;
S32 getTabIndex(void) { return mTabIndex; }
void selectWindow(void);
////
const RectI getClientRect();
const RectI getClientRect() override;
/// Mutators for window properties from code.
/// Using setDataField is a bit overkill.
@ -271,15 +271,15 @@ class GuiWindowCtrl : public GuiContainer
/// @}
// GuiContainer.
virtual bool onWake();
virtual void onSleep();
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseMove(const GuiEvent &event);
virtual bool onKeyDown(const GuiEvent &event);
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onSleep() override;
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseMove(const GuiEvent &event) override;
bool onKeyDown(const GuiEvent &event) override;
void onRender(Point2I offset, const RectI &updateRect) override;
DECLARE_CONOBJECT( GuiWindowCtrl );
DECLARE_DESCRIPTION( "A control that shows an independent window inside the canvas." );

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

@ -57,12 +57,12 @@ public:
Point2I mUseEyePoint; /// optionally use the eye point. x != 0 -> horiz. y != 0 -> vert.
virtual void onRender (Point2I offset, const RectI &updateRect);
void onRender (Point2I offset, const RectI &updateRect) override;
virtual void resizeDuringRender ();
virtual bool onWake ();
virtual void onSleep ();
virtual void onDeleteNotify (SimObject *object);
bool onWake () override;
void onSleep () override;
void onDeleteNotify (SimObject *object) override;
void doPositioning ();
void doProjection ();

4
Engine/source/gui/controls/guiAnimBitmapCtrl.h
View file

@ -54,10 +54,10 @@ protected:
public:
guiAnimBitmapCtrl();
~guiAnimBitmapCtrl();
bool onAdd();
bool onAdd() override;
static void initPersistFields();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
DECLARE_CONOBJECT(guiAnimBitmapCtrl);
DECLARE_CATEGORY("Gui Images");
DECLARE_DESCRIPTION("A control that clips a bitmap based on %.");

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

@ -39,7 +39,7 @@ protected:
public:
GuiBitmapBarCtrl();
static void initPersistFields();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
DECLARE_CONOBJECT(GuiBitmapBarCtrl);
DECLARE_CATEGORY("Gui Images");

6
Engine/source/gui/controls/guiBitmapBorderCtrl.cpp
View file

@ -55,9 +55,9 @@ public:
static void initPersistFields();
bool onWake();
void onSleep();
void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onSleep() override;
void onRender(Point2I offset, const RectI &updateRect) override;
DECLARE_CONOBJECT(GuiBitmapBorderCtrl);
DECLARE_CATEGORY( "Gui Images" );
DECLARE_DESCRIPTION( "A control that renders a skinned border." );

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

@ -119,7 +119,7 @@ class GuiColorPickerCtrl : public GuiControl
~GuiColorPickerCtrl();
static void initPersistFields();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
bool mShowReticle; ///< Show reticle on render
/// @name Color Value Functions
/// @{
@ -127,8 +127,8 @@ class GuiColorPickerCtrl : public GuiControl
void setValue(LinearColorF &value) {mBaseColor = value;}
/// NOTE: getValue() returns baseColor if pallet (since pallet controls can't "pick" colours themselves)
LinearColorF getValue() { return mDisplayMode == pPallet ? mBaseColor : mPickColor; }
const char *getScriptValue();
void setScriptValue(const char *value);
const char *getScriptValue() override;
void setScriptValue(const char *value) override;
void updateColor() {mPositionChanged = true;}
/// @}
@ -141,13 +141,13 @@ class GuiColorPickerCtrl : public GuiControl
/// @name Input Events
/// @{
void onMouseDown(const GuiEvent &);
void onMouseUp(const GuiEvent &);
void onMouseMove(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
void onMouseDown(const GuiEvent &) override;
void onMouseUp(const GuiEvent &) override;
void onMouseMove(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &);
void onMouseLeave(const GuiEvent &);
void onMouseEnter(const GuiEvent &) override;
void onMouseLeave(const GuiEvent &) override;
/// @}
};

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

@ -59,7 +59,7 @@ class GuiConsole : public GuiArrayCtrl
/// @}
// GuiArrayCtrl.
virtual void onCellSelected( Point2I cell );
void onCellSelected( Point2I cell ) override;
public:
GuiConsole();
@ -68,9 +68,9 @@ class GuiConsole : public GuiArrayCtrl
DECLARE_DESCRIPTION( "Control that displays the console log text." );
// GuiArrayCtrl.
virtual bool onWake();
virtual void onPreRender();
virtual void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
bool onWake() override;
void onPreRender() override;
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
void setDisplayFilters(bool errors, bool warns, bool normal);
bool getErrorFilter() { return mDisplayErrors; }

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

@ -50,7 +50,7 @@ public:
static void initPersistFields();
bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
};
#endif //_GUI_TEXTEDIT_CTRL_H

12
Engine/source/gui/controls/guiConsoleTextCtrl.h
View file

@ -62,8 +62,8 @@ public:
static void initPersistFields();
//Parental methods
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
//text methods
virtual void setText( const char *txt = NULL );
@ -71,12 +71,12 @@ public:
//rendering methods
void calcResize();
void onPreRender(); // do special pre render processing
void onRender( Point2I offset, const RectI &updateRect );
void onPreRender() override; // do special pre render processing
void onRender( Point2I offset, const RectI &updateRect ) override;
//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_

28
Engine/source/gui/controls/guiDecoyCtrl.h
View file

@ -48,22 +48,22 @@ public:
Point2I mMouseDownPosition;
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);
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;
virtual bool onMouseWheelUp(const GuiEvent &event);
virtual bool onMouseWheelDown(const GuiEvent &event);
bool onMouseWheelUp(const GuiEvent &event) override;
bool onMouseWheelDown(const GuiEvent &event) override;
virtual void onRightMouseDown(const GuiEvent &event);
virtual void onRightMouseUp(const GuiEvent &event);
virtual void onRightMouseDragged(const GuiEvent &event);
void onRightMouseDown(const GuiEvent &event) override;
void onRightMouseUp(const GuiEvent &event) override;
void onRightMouseDragged(const GuiEvent &event) override;
virtual void onMiddleMouseDown(const GuiEvent &event);
virtual void onMiddleMouseUp(const GuiEvent &event);
virtual void onMiddleMouseDragged(const GuiEvent &event);
void onMiddleMouseDown(const GuiEvent &event) override;
void onMiddleMouseUp(const GuiEvent &event) override;
void onMiddleMouseDragged(const GuiEvent &event) override;
};
#endif

4
Engine/source/gui/controls/guiDirectoryFileListCtrl.h
View file

@ -72,8 +72,8 @@ public:
/// Get the currently selected file's name
StringTableEntry getSelectedFileName();
virtual void onMouseDown(const GuiEvent &event);
virtual bool onWake();
void onMouseDown(const GuiEvent &event) override;
bool onWake() override;
};
#endif

6
Engine/source/gui/controls/guiFileTreeCtrl.h
View file

@ -57,9 +57,9 @@ public:
GuiFileTreeCtrl();
bool onWake();
bool onVirtualParentExpand(Item *item);
void onItemSelected( Item *item );
bool onWake() override;
bool onVirtualParentExpand(Item *item) override;
void onItemSelected( Item *item ) override;
const String& getSelectedPath() { return mSelPath; }
bool setSelectedPath( const char* path );

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

@ -266,7 +266,7 @@ public:
GuiGameListMenuCtrl();
~GuiGameListMenuCtrl();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
void onRenderListOption(Row* row, Point2I currentOffset);
void onRenderSliderOption(Row* row, Point2I currentOffset);
@ -276,67 +276,67 @@ public:
/// Callback when the object is registered with the sim.
///
/// \return True if the profile was successfully added, false otherwise.
bool onAdd();
bool onAdd() override;
/// Callback when the control wakes up.
bool onWake();
bool onWake() override;
/// Callback when a key is pressed.
///
/// \param event The event that triggered this callback.
bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
/// Callback when a key is repeating.
///
/// \param event The event that triggered this callback.
bool onKeyRepeat(const GuiEvent &event){ return onKeyDown(event); }
bool onKeyRepeat(const GuiEvent &event) override{ return onKeyDown(event); }
/// Callback when the mouse button is clicked on the control.
///
/// \param event A reference to the event that triggered the callback.
void onMouseDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
/// Callback when the mouse is dragged on the control.
///
/// \param event A reference to the event that triggered the callback.
void onMouseDragged(const GuiEvent &event){ onMouseDown(event); }
void onMouseDragged(const GuiEvent &event) override{ onMouseDown(event); }
/// Callback when the mouse leaves the control.
///
/// \param event A reference to the event that triggered the callback.
void onMouseLeave(const GuiEvent &event);
void onMouseLeave(const GuiEvent &event) override;
/// Callback when the mouse is moving over this control
///
/// \param event A reference to the event that triggered the callback.
void onMouseMove(const GuiEvent &event);
void onMouseMove(const GuiEvent &event) override;
/// Callback when the mouse button is released.
///
/// \param event A reference to the event that triggered the callback.
void onMouseUp(const GuiEvent &event);
void onMouseUp(const GuiEvent &event) override;
virtual bool onInputEvent(const InputEventInfo& event);
bool onInputEvent(const InputEventInfo& event) override;
/// Callback when the gamepad axis is activated.
///
/// \param event A reference to the event that triggered the callback.
virtual bool onGamepadAxisUp(const GuiEvent & event);
bool onGamepadAxisUp(const GuiEvent & event) override;
/// Callback when the gamepad axis is activated.
///
/// \param event A reference to the event that triggered the callback.
virtual bool onGamepadAxisDown(const GuiEvent & event);
bool onGamepadAxisDown(const GuiEvent & event) override;
/// Callback when the gamepad axis is activated.
///
/// \param event A reference to the event that triggered the callback.
virtual bool onGamepadAxisLeft(const GuiEvent& event);
bool onGamepadAxisLeft(const GuiEvent& event) override;
/// Callback when the gamepad axis is activated.
///
/// \param event A reference to the event that triggered the callback.
virtual bool onGamepadAxisRight(const GuiEvent& event);
bool onGamepadAxisRight(const GuiEvent& event) override;
void clearRows();
@ -458,7 +458,7 @@ private:
private:
/// Recalculates the height of this control based on the stored row height and
/// and padding on the rows.
virtual Point2I getMinExtent() const;
Point2I getMinExtent() const override;
/// Makes sure the height will allow all rows to be displayed without being
/// truncated.
@ -537,7 +537,7 @@ public:
/// Callback when the object is registered with the sim.
///
/// \return True if the profile was successfully added, false otherwise.
bool onAdd();
bool onAdd() override;
Point2I mHitAreaUpperLeft; ///< Offset for the upper left corner of the hit area
Point2I mHitAreaLowerRight; ///< Offset for the lower right corner of the hit area

22
Engine/source/gui/controls/guiGameListOptionsCtrl.h
View file

@ -93,32 +93,32 @@ public:
/// \param enabled [optional] If this row is initially enabled. Default true.
void addRow(const char* label, const char* optionsList, bool wrapOptions, const char* callback, S32 icon = -1, S32 yPad = 0, bool enabled = true);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
/// Callback when the mouse button is released.
///
/// \param event A reference to the event that triggered the callback.
void onMouseUp(const GuiEvent &event);
void onMouseUp(const GuiEvent &event) override;
/// Callback when a key is pressed.
///
/// \param event The event that triggered this callback.
bool onKeyDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
/// Callback when a key is repeating.
///
/// \param event The event that triggered this callback.
bool onKeyRepeat(const GuiEvent &event){ return onKeyDown(event); }
bool onKeyRepeat(const GuiEvent &event) override{ return onKeyDown(event); }
/// Callback when the gamepad axis is activated.
///
/// \param event A reference to the event that triggered the callback.
virtual bool onGamepadAxisLeft(const GuiEvent &event);
bool onGamepadAxisLeft(const GuiEvent &event) override;
/// Callback when the gamepad axis is activated.
///
/// \param event A reference to the event that triggered the callback.
virtual bool onGamepadAxisRight(const GuiEvent &event);
bool onGamepadAxisRight(const GuiEvent &event) override;
virtual void clearRows();
@ -128,7 +128,7 @@ public:
DECLARE_CONOBJECT(GuiGameListOptionsCtrl);
DECLARE_DESCRIPTION( "A control for showing pages of options that are gamepad friendly." );
virtual bool onAdd();
bool onAdd() override;
/// Initializes fields accessible through the console.
static void initPersistFields();
@ -140,15 +140,15 @@ protected:
///
/// \return True if the profile is of type GuiGameListOptionsProfile or false
/// if the profile is of any other type.
bool hasValidProfile() const;
bool hasValidProfile() const override;
/// Enforces the validity of the fields on this control and its profile (if the
/// profile is valid, see: hasValidProfile).
void enforceConstraints();
void enforceConstraints() override;
/// Adds lines around the column divisions to the feedback already provided
/// in the Parent.
void onDebugRender(Point2I offset);
void onDebugRender(Point2I offset) override;
private:
/// Performs a click on the current option row. The x position is used to
@ -183,7 +183,7 @@ class GuiGameListOptionsProfile : public GuiGameListMenuProfile
public:
/// Enforces range constraints on all required fields.
void enforceConstraints();
void enforceConstraints() override;
GuiGameListOptionsProfile();

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

@ -230,7 +230,7 @@ public:
GuiGameSettingsCtrl();
~GuiGameSettingsCtrl();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
void onRenderListOption(Point2I currentOffset);
void onRenderSliderOption(Point2I currentOffset);
@ -240,17 +240,17 @@ public:
/// Callback when the object is registered with the sim.
///
/// \return True if the profile was successfully added, false otherwise.
bool onAdd();
bool onAdd() override;
/// Callback when the control wakes up.
bool onWake();
bool onWake() override;
void onSleep();
void onSleep() override;
void clear();
void clear() override;
virtual void onMouseMove(const GuiEvent& event);
virtual void onMouseUp(const GuiEvent& event);
void onMouseMove(const GuiEvent& event) override;
void onMouseUp(const GuiEvent& event) override;
DECLARE_CONOBJECT(GuiGameSettingsCtrl);
DECLARE_CATEGORY( "Gui Game" );

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

@ -42,11 +42,11 @@ public:
DECLARE_CALLBACK( void, onMouseDown, ());
DECLARE_CALLBACK( void, onDoubleClick, ());
GuiGradientSwatchCtrl();
void onMouseDown(const GuiEvent &);
void onRightMouseDown(const GuiEvent &);
void onMouseDragged(const GuiEvent &event);
void onRender(Point2I offset, const RectI &updateRect);
bool onWake();
void onMouseDown(const GuiEvent &) override;
void onRightMouseDown(const GuiEvent &) override;
void onMouseDragged(const GuiEvent &event) override;
void onRender(Point2I offset, const RectI &updateRect) override;
bool onWake() override;
protected:
StringTableEntry mColorFunction;
};
@ -121,7 +121,7 @@ public:
GuiGradientCtrl();
static void initPersistFields();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
bool mShowReticle; ///< Show reticle on render
/// @name Color Value Functions
/// @{
@ -134,19 +134,19 @@ public:
/// @name Input Events
/// @{
void onMouseDown(const GuiEvent &);
void onMouseUp(const GuiEvent &);
void onMouseDown(const GuiEvent &) override;
void onMouseUp(const GuiEvent &) override;
void onMouseEnter(const GuiEvent &);
void onMouseLeave(const GuiEvent &);
void onMouseEnter(const GuiEvent &) override;
void onMouseLeave(const GuiEvent &) override;
/// @}
void addColorRange(ColorI color);
void setupDefaultRange();
bool onAdd();
void inspectPreApply();
void inspectPostApply();
bool onAdd() override;
void inspectPreApply() override;
void inspectPostApply() override;
void reInitSwatches( GuiGradientCtrl::PickMode );
void addColorRange(Point2I pos, const LinearColorF& color);
void removeColorRange( GuiGradientSwatchCtrl* swatch );

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

@ -123,21 +123,21 @@ public:
// Sizing
void updateSize();
virtual void parentResized(const RectI& oldParentRect, const RectI& newParentRect);
virtual bool onWake();
void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
bool onWake() override;
// Rendering
virtual void onRender( Point2I offset, const RectI &updateRect );
void onRender( Point2I offset, const RectI &updateRect ) override;
virtual void onRenderItem(const RectI& itemRect, LBItem *item);
void drawBox( const Point2I &box, S32 size, ColorI &outlineColor, ColorI &boxColor );
bool renderTooltip( const Point2I &hoverPos, const Point2I& cursorPos, const char* tipText );
void addFilteredItem( String item );
void removeFilteredItem( String item );
// Mouse/Key Events
virtual void onMouseDown( const GuiEvent &event );
virtual void onMouseDragged(const GuiEvent &event);
virtual void onMouseUp( const GuiEvent& event );
virtual bool onKeyDown( const GuiEvent &event );
void onMouseDown( const GuiEvent &event ) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp( const GuiEvent& event ) override;
bool onKeyDown( const GuiEvent &event ) override;
// String Utility
static U32 getStringElementCount( const char *string );

30
Engine/source/gui/controls/guiMLTextCtrl.h
View file

@ -167,8 +167,8 @@ class GuiMLTextCtrl : public GuiControl
static void initPersistFields();
void setScriptValue(const char *value);
const char *getScriptValue();
void setScriptValue(const char *value) override;
const char *getScriptValue() override;
static char *stripControlChars(const char *inString);
@ -291,30 +291,30 @@ class GuiMLTextCtrl : public GuiControl
S32 getTextPosition(const Point2I& localPosition);
// Gui control overrides
bool onWake();
void onSleep();
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onSleep() override;
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
void getCursorPositionAndColor(Point2I &cursorTop, Point2I &cursorBottom, ColorI &color);
void inspectPostApply();
void parentResized(const RectI& oldParentRect, const RectI& newParentRect);
bool onKeyDown(const GuiEvent& event);
void onMouseDown(const GuiEvent&);
void onMouseDragged(const GuiEvent&);
void onMouseUp(const GuiEvent&);
void inspectPostApply() override;
void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
bool onKeyDown(const GuiEvent& event) override;
void onMouseDown(const GuiEvent&) override;
void onMouseDragged(const GuiEvent&) override;
void onMouseUp(const GuiEvent&) override;
virtual void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
public:
// Gui control overrides
bool onAdd();
bool onAdd() override;
void setSelectionStart( U32 start ) { clearSelection(); mSelectionStart = start; };
void setSelectionEnd( U32 end ) { mSelectionEnd = end;};
void setSelectionActive(bool active) { mSelectionActive = active; };
S32 getCursorPosition() { return( mCursorPosition ); }
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
bool isTypingOut();
};

12
Engine/source/gui/controls/guiMLTextEditCtrl.h
View file

@ -36,24 +36,24 @@ class GuiMLTextEditCtrl : public GuiMLTextCtrl
StringTableEntry mEscapeCommand;
// Events
bool onKeyDown(const GuiEvent&event);
bool onKeyDown(const GuiEvent&event) override;
// Event forwards
void handleMoveKeys(const GuiEvent&);
void handleDeleteKeys(const GuiEvent&);
// rendering
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
public:
GuiMLTextEditCtrl();
~GuiMLTextEditCtrl();
virtual void setFirstResponder();
virtual void onLoseFirstResponder();
void setFirstResponder() override;
void onLoseFirstResponder() override;
bool onWake();
bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool onWake() override;
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
DECLARE_CONOBJECT(GuiMLTextEditCtrl);
DECLARE_DESCRIPTION( "A control that allows to edit multiple lines of text." );

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

@ -53,18 +53,18 @@ public:
// ConsoleObject
static void initPersistFields();
void inspectPostApply();
void inspectPostApply() override;
DECLARE_CONOBJECT(GuiMaterialCtrl);
DECLARE_CATEGORY( "Gui Editor" );
// GuiControl
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
bool setMaterial( const String &materialName );
void onRender( Point2I offset, const RectI &updateRect );
void onRender( Point2I offset, const RectI &updateRect ) override;
};
#endif // _GUIMATERIALCTRL_H_

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

@ -87,26 +87,26 @@ class GuiSliderCtrl : public GuiControl
const Point2F& getRange() const { return mRange; }
// GuiControl.
bool onWake();
bool onWake() override;
void onMouseDown(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
void onMouseUp(const GuiEvent &);
void onMouseLeave(const GuiEvent &);
void onMouseEnter(const GuiEvent &);
bool onMouseWheelUp(const GuiEvent &event);
bool onMouseWheelDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &) override;
void onMouseLeave(const GuiEvent &) override;
void onMouseEnter(const GuiEvent &) override;
bool onMouseWheelUp(const GuiEvent &event) override;
bool onMouseWheelDown(const GuiEvent &event) override;
void setActive( bool value );
void setActive( bool value ) override;
F32 getValue() const { return mValue; }
void setScriptValue(const char *val) { setValue(dAtof(val)); }
void setScriptValue(const char *val) override { setValue(dAtof(val)); }
void setValue(F32 val, bool doCallback=false);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
virtual bool resize( const Point2I& newSize, const Point2I& newExtent );
virtual void parentResized( const RectI& oldParentRect, const RectI& newParentRect );
bool resize( const Point2I& newSize, const Point2I& newExtent ) override;
void parentResized( const RectI& oldParentRect, const RectI& newParentRect ) override;
static void initPersistFields();

20
Engine/source/gui/controls/guiTabPageCtrl.h
View file

@ -44,29 +44,29 @@ class GuiTabPageCtrl : public GuiTextCtrl
static void initPersistFields();
bool onWake(); ///< The page awakens (becomes active)!
void onSleep(); ///< The page sleeps (zzzzZZ - becomes inactive)
void inspectPostApply();
bool onWake() override; ///< The page awakens (becomes active)!
void onSleep() override; ///< The page sleeps (zzzzZZ - becomes inactive)
void inspectPostApply() override;
bool getFitBook() { return mFitBook; }
void setFitBook(bool state) { mFitBook = state; }
GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1); ///< Find which control is hit by the mouse starting at a specified layer
GuiControl* findHitControl(const Point2I &pt, S32 initialLayer = -1) override; ///< Find which control is hit by the mouse starting at a specified layer
void onMouseDown(const GuiEvent &event); ///< Called when a mouseDown event occurs
bool onMouseDownEditor(const GuiEvent &event, Point2I offset ); ///< Called when a mouseDown event occurs and the GUI editor is active
void onMouseDown(const GuiEvent &event) override; ///< Called when a mouseDown event occurs
bool onMouseDownEditor(const GuiEvent &event, Point2I offset ) override; ///< Called when a mouseDown event occurs and the GUI editor is active
S32 getTabIndex(void) { return mTabIndex; } ///< Get the tab index of this control
//only cycle tabs through the current window, so overwrite the method
GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true);
GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true);
GuiControl* findNextTabable(GuiControl *curResponder, bool firstCall = true) override;
GuiControl* findPrevTabable(GuiControl *curResponder, bool firstCall = true) override;
void selectWindow(void); ///< Select this window
virtual void setText(const char *txt = NULL); ///< Override setText function to signal parent we need to update.
void setText(const char *txt = NULL) override; ///< Override setText function to signal parent we need to update.
void onRender(Point2I offset, const RectI &updateRect); ///< Called when it's time to render this page to the scene
void onRender(Point2I offset, const RectI &updateRect) override; ///< Called when it's time to render this page to the scene
};
#endif //_GUI_WINDOW_CTRL_H

20
Engine/source/gui/controls/guiTextEditSliderBitmapCtrl.h
View file

@ -56,23 +56,23 @@ 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;
bool onWake();
virtual void onPreRender();
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
void setBitmap(const char *name);

18
Engine/source/gui/core/guiScriptNotifyControl.h
View file

@ -56,11 +56,11 @@ public:
virtual ~GuiScriptNotifyCtrl();
static void initPersistFields();
virtual bool resize(const Point2I &newPosition, const Point2I &newExtent);
bool resize(const Point2I &newPosition, const Point2I &newExtent) override;
virtual void childResized(GuiScriptNotifyCtrl *child);
virtual void parentResized(const RectI &oldParentRect, const RectI &newParentRect);
virtual void onChildRemoved( GuiControl *child );
virtual void onChildAdded( GuiControl *child );
void parentResized(const RectI &oldParentRect, const RectI &newParentRect) override;
void onChildRemoved( GuiControl *child ) override;
void onChildAdded( GuiControl *child ) override;
DECLARE_CALLBACK(void, onResize, (SimObjectId ID) );
DECLARE_CALLBACK(void, onChildAdded, (SimObjectId ID, SimObjectId childID));
@ -94,10 +94,10 @@ public:
//virtual void onMouseDownEditor(const GuiEvent &event, Point2I offset);
//virtual void onRightMouseDownEditor(const GuiEvent &event, Point2I offset);
virtual void setFirstResponder(GuiControl *firstResponder);
virtual void setFirstResponder();
void setFirstResponder(GuiControl *firstResponder) override;
void setFirstResponder() override;
void clearFirstResponder();
virtual void onLoseFirstResponder();
void onLoseFirstResponder() override;
//virtual void acceleratorKeyPress(U32 index);
//virtual void acceleratorKeyRelease(U32 index);
@ -107,8 +107,8 @@ public:
virtual void onMessage(GuiScriptNotifyCtrl *sender, S32 msg); ///< Receive a message from another control
virtual void onDialogPush();
virtual void onDialogPop();
void onDialogPush() override;
void onDialogPop() override;
};

14
Engine/source/gui/editor/guiDebugger.h
View file

@ -75,9 +75,9 @@ class DbgFileView : public GuiArrayCtrl
DECLARE_CONOBJECT(DbgFileView);
DECLARE_CATEGORY( "Gui Editor" );
bool onWake();
bool onWake() override;
void clear();
void clear() override;
void clearBreakPositions();
void setCurrentLine(S32 lineNumber, bool setCurrentLine);
@ -90,12 +90,12 @@ class DbgFileView : public GuiArrayCtrl
bool findString(const char *text);
void onMouseDown(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onPreRender();
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver);
void onPreRender() override;
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
};
#endif //_GUI_DEBUGGER_H

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

@ -49,10 +49,10 @@ class GuiEaseViewCtrl : public GuiControl
GuiEaseViewCtrl();
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
void onRender( Point2I, const RectI &);
void onRender( Point2I, const RectI &) override;
static void initPersistFields();
DECLARE_CONOBJECT( GuiEaseViewCtrl );

8
Engine/source/gui/editor/guiEditCtrl.cpp
View file

@ -2834,7 +2834,7 @@ class GuiEditorRuler : public GuiControl
return ORIENTATION_Vertical;
}
bool onWake()
bool onWake() override
{
if( !Parent::onWake() )
return false;
@ -2848,12 +2848,12 @@ class GuiEditorRuler : public GuiControl
return true;
}
void onPreRender()
void onPreRender() override
{
setUpdate();
}
void onMouseDown( const GuiEvent& event )
void onMouseDown( const GuiEvent& event ) override
{
if( !mEditCtrl )
return;
@ -2872,7 +2872,7 @@ class GuiEditorRuler : public GuiControl
mEditCtrl->startMouseGuideDrag( axis, guideIndex );
}
void onRender(Point2I offset, const RectI &updateRect)
void onRender(Point2I offset, const RectI &updateRect) override
{
GFX->getDrawUtil()->drawRectFill(updateRect, ColorI::DARK);

24
Engine/source/gui/editor/guiEditCtrl.h
View file

@ -246,8 +246,8 @@ class GuiEditCtrl : public GuiControl
DECLARE_CATEGORY( "Gui Editor" );
DECLARE_DESCRIPTION( "Implements the framework for the GUI editor." );
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
static void initPersistFields();
@ -258,8 +258,8 @@ class GuiEditCtrl : public GuiControl
void getDragRect(RectI &b);
void drawNut(const Point2I &nut, ColorI &outlineColor, ColorI &nutColor);
void drawNuts(RectI &box, ColorI &outlineColor, ColorI &nutColor);
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
void addNewControl(GuiControl *ctrl);
void setCurrentAddSet(GuiControl *ctrl, bool clearSelection = true);
GuiControl* getCurrentAddSet();
@ -314,7 +314,7 @@ class GuiEditCtrl : public GuiControl
void controlInspectPostApply(GuiControl* object);
// Sizing Cursors
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent);
void getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent &lastGuiEvent) override;
U32 getSelectionSize() const { return mSelectedControls.size(); }
const Vector<GuiControl *>& getSelected() const { return mSelectedControls; }
@ -322,16 +322,16 @@ class GuiEditCtrl : public GuiControl
SimGroup* getTrash() { return mTrash; }
GuiControl* getAddSet() const { return mCurrentAddSet; }; //JDD
bool onKeyDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
void onRightMouseDown(const GuiEvent &event);
bool onKeyDown(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onRightMouseDown(const GuiEvent &event) override;
mouseModes getMouseMode() const { return mMouseDownMode; }
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
void setSnapToGrid(U32 gridsize);
};

12
Engine/source/gui/editor/guiFilterCtrl.h
View file

@ -66,11 +66,11 @@ public:
static void initPersistFields();
//Parental methods
bool onWake();
bool onWake() override;
void onMouseDown(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
void onMouseUp(const GuiEvent &);
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &) override;
F32 getValue(S32 n);
const Filter* get() { return &mFilter; }
@ -78,8 +78,8 @@ public:
S32 getNumControlPoints() {return mFilter.size(); }
void identity();
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect );
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect ) override;
};

2
Engine/source/gui/editor/guiGraphCtrl.h
View file

@ -73,7 +73,7 @@ class GuiGraphCtrl : public GuiControl
void setMax( S32 plotID, F32 max ) { mGraphMax[ plotID ] = max; }
// GuiControl.
virtual void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
DECLARE_CONOBJECT(GuiGraphCtrl);
DECLARE_CATEGORY( "Gui Other" );

30
Engine/source/gui/editor/guiMenuBar.h
View file

@ -81,33 +81,33 @@ public:
GuiMenuBar();
void onRemove();
bool onWake();
void onSleep();
void onRemove() override;
bool onWake() override;
void onSleep() override;
virtual void addObject(SimObject* object);
void addObject(SimObject* object) override;
MenuEntry *findHitMenu(Point2I mousePoint);
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
void checkMenuMouseMove(const GuiEvent &event);
void onMouseMove(const GuiEvent &event);
void onMouseEnter(const GuiEvent &event);
void onMouseLeave(const GuiEvent &event);
void onMouseDown(const GuiEvent &event);
void onMouseDragged(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseMove(const GuiEvent &event) override;
void onMouseEnter(const GuiEvent &event) override;
void onMouseLeave(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onAction();
void onAction() override;
void closeMenu();
void buildWindowAcceleratorMap( WindowInputGenerator &inputGenerator );
void removeWindowAcceleratorMap( WindowInputGenerator &inputGenerator );
void acceleratorKeyPress(U32 index);
void acceleratorKeyPress(U32 index) override;
// Added to support 'ticks'
void processTick();
void processTick() override;
void insert(SimObject* pObject, S32 pos);
void remove(SimObject* pObject);

18
Engine/source/gui/editor/guiParticleGraphCtrl.h
View file

@ -99,18 +99,18 @@ public:
GuiParticleGraphCtrl();
virtual ~GuiParticleGraphCtrl() { };
void onMouseMove(const GuiEvent &event);
void onMouseDown( const GuiEvent &event );
void onMouseUp( const GuiEvent &event );
void onMouseDragged( const GuiEvent &event );
void onRightMouseDown( const GuiEvent &event );
void onRightMouseUp( const GuiEvent &event );
void onRightMouseDragged( const GuiEvent &event );
void onMouseMove(const GuiEvent &event) override;
void onMouseDown( const GuiEvent &event ) override;
void onMouseUp( const GuiEvent &event ) override;
void onMouseDragged( const GuiEvent &event ) override;
void onRightMouseDown( const GuiEvent &event ) override;
void onRightMouseUp( const GuiEvent &event ) override;
void onRightMouseDragged( const GuiEvent &event ) override;
//Parental methods
bool onWake();
bool onWake() override;
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
bool renderGraphTooltip(Point2I cursorPos, StringTableEntry tooltip);
// Graph interface

18
Engine/source/gui/editor/guiPopupMenuCtrl.h
View file

@ -61,12 +61,12 @@ public:
GuiPopupMenuTextListCtrl();
// GuiControl overloads:
bool onKeyDown(const GuiEvent &event);
void onMouseDown(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 onMouseDown(const GuiEvent &event) override;
void onMouseUp(const GuiEvent &event) override;
void onRenderCell(Point2I offset, Point2I cell, bool selected, bool mouseOver) override;
virtual void onCellHighlighted(Point2I cell); // Added
void onCellHighlighted(Point2I cell) override; // Added
};
class GuiPopupMenuBackgroundCtrl : public GuiControl
@ -75,10 +75,10 @@ class GuiPopupMenuBackgroundCtrl : public GuiControl
public:
GuiPopupMenuBackgroundCtrl();
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event);
void onMouseMove(const GuiEvent &event);
void onMouseDragged(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 close();

8
Engine/source/gui/editor/guiRectHandles.h
View file

@ -49,11 +49,11 @@ public:
static void initPersistFields();
virtual void onMouseUp(const GuiEvent &event);
virtual void onMouseDown(const GuiEvent &event);
virtual void onMouseDragged(const GuiEvent &event);
void onMouseUp(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
void onMouseDragged(const GuiEvent &event) override;
virtual void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
};
#endif

2
Engine/source/gui/editor/guiSeparatorCtrl.h
View file

@ -58,7 +58,7 @@ public:
static void initPersistFields();
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
};
typedef GuiSeparatorCtrl::separatorTypeOptions GuiSeparatorType;

40
Engine/source/gui/editor/guiShapeEdPreview.h
View file

@ -163,7 +163,7 @@ protected:
void updateThreads(F32 delta);
// Rendering
void renderGrid();
void renderGrid() override;
void renderNodes() const;
void renderNodeAxes(S32 index, const LinearColorF& nodeColor) const;
void renderNodeName(S32 index, const LinearColorF& textColor) const;
@ -171,27 +171,27 @@ protected:
void renderCollisionMeshes() const;
public:
bool onWake();
bool onWake() override;
void setDisplayType(S32 type);
void setDisplayType(S32 type) override;
/// @name Mouse event handlers
///@{
void onMouseDown(const GuiEvent& event) { handleMouseDown(event, NoneMode); }
void onMouseUp(const GuiEvent& event) { handleMouseUp(event, NoneMode); }
void onMouseMove(const GuiEvent& event) { handleMouseMove(event, NoneMode); }
void onMouseDragged(const GuiEvent& event) { handleMouseDragged(event, NoneMode); }
void onMouseDown(const GuiEvent& event) override { handleMouseDown(event, NoneMode); }
void onMouseUp(const GuiEvent& event) override { handleMouseUp(event, NoneMode); }
void onMouseMove(const GuiEvent& event) override { handleMouseMove(event, NoneMode); }
void onMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, NoneMode); }
void onMiddleMouseDown(const GuiEvent& event) { handleMouseDown(event, MoveMode); }
void onMiddleMouseUp(const GuiEvent& event) { handleMouseUp(event, MoveMode); }
void onMiddleMouseDragged(const GuiEvent& event) { handleMouseDragged(event, MoveMode); }
void onMiddleMouseDown(const GuiEvent& event) override { handleMouseDown(event, MoveMode); }
void onMiddleMouseUp(const GuiEvent& event) override { handleMouseUp(event, MoveMode); }
void onMiddleMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, MoveMode); }
void onRightMouseDown(const GuiEvent& event) { handleMouseDown(event, RotateMode); }
void onRightMouseUp(const GuiEvent& event) { handleMouseUp(event, RotateMode); }
void onRightMouseDragged(const GuiEvent& event) { handleMouseDragged(event, RotateMode); }
void onRightMouseDown(const GuiEvent& event) override { handleMouseDown(event, RotateMode); }
void onRightMouseUp(const GuiEvent& event) override { handleMouseUp(event, RotateMode); }
void onRightMouseDragged(const GuiEvent& event) override { handleMouseDragged(event, RotateMode); }
void on3DMouseWheelUp(const Gui3DMouseEvent& event);
void on3DMouseWheelDown(const Gui3DMouseEvent& event);
void on3DMouseWheelUp(const Gui3DMouseEvent& event) override;
void on3DMouseWheelDown(const Gui3DMouseEvent& event) override;
///@}
// Setters/Getters
@ -234,7 +234,7 @@ public:
void refreshShape();
void updateNodeTransforms();
void get3DCursor(GuiCursor *& cursor, bool& visible, const Gui3DMouseEvent& event_);
void get3DCursor(GuiCursor *& cursor, bool& visible, const Gui3DMouseEvent& event_) override;
void fitToShape();
void setOrbitPos( const Point3F& pos );
@ -243,15 +243,15 @@ public:
/// @name Rendering
///@{
bool getCameraTransform(MatrixF* cameraMatrix);
void computeSceneBounds(Box3F& bounds);
bool getCameraTransform(MatrixF* cameraMatrix) override;
void computeSceneBounds(Box3F& bounds) override;
bool getMeshHidden(const char* name) const;
void setMeshHidden(const char* name, bool hidden);
void setAllMeshesHidden(bool hidden);
void renderWorld(const RectI& updateRect);
void renderGui(Point2I offset, const RectI& updateRect);
void renderWorld(const RectI& updateRect) override;
void renderGui(Point2I offset, const RectI& updateRect) override;
///@}
DECLARE_CONOBJECT(GuiShapeEdPreview);

20
Engine/source/gui/editor/inspector/customField.h
View file

@ -38,27 +38,27 @@ public:
DECLARE_CONOBJECT( GuiInspectorCustomField );
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual void updateValue();
virtual StringTableEntry getFieldName() { return StringTable->EmptyString(); }
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
void updateValue() override;
StringTableEntry getFieldName() override { return StringTable->EmptyString(); }
virtual void setDoc( const char* doc );
virtual void setToolTip( StringTableEntry data );
virtual bool onAdd();
bool onAdd() override;
virtual void setInspectorField( AbstractClassRep::Field *field,
void setInspectorField( AbstractClassRep::Field *field,
StringTableEntry caption = NULL,
const char *arrayIndex = NULL );
const char *arrayIndex = NULL ) override;
virtual GuiControl* constructEditControl();
GuiControl* constructEditControl() override;
virtual void setValue( const char* newValue );
void setValue( const char* newValue ) override;
protected:
virtual void _executeSelectedCallback();
void _executeSelectedCallback() override;
protected:

14
Engine/source/gui/editor/inspector/datablockField.h
View file

@ -44,9 +44,9 @@ class GuiInspectorDatablockField : public GuiInspectorTypeMenuBase
RectI mBrowseRect;
virtual SimSet* _getDatablockSet() const { return Sim::getDataBlockSet(); }
virtual void _populateMenu( GuiPopUpMenuCtrlEx* menu );
virtual GuiControl* constructEditControl();
virtual bool updateRects();
void _populateMenu( GuiPopUpMenuCtrlEx* menu ) override;
GuiControl* constructEditControl() override;
bool updateRects() override;
public:
@ -69,7 +69,7 @@ class GuiInspectorTypeSFXDescriptionName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXDescriptionSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXDescriptionSet(); }
public:
@ -89,7 +89,7 @@ class GuiInspectorTypeSFXTrackName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXTrackSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXTrackSet(); }
public:
@ -109,7 +109,7 @@ class GuiInspectorTypeSFXEnvironmentName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXEnvironmentSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXEnvironmentSet(); }
public:
DECLARE_CONOBJECT(GuiInspectorTypeSFXEnvironmentName);
@ -128,7 +128,7 @@ class GuiInspectorTypeSFXAmbienceName : public GuiInspectorDatablockField
protected:
virtual SimSet* _getDatablockSet() const { return Sim::getSFXAmbienceSet(); }
SimSet* _getDatablockSet() const override { return Sim::getSFXAmbienceSet(); }
public:

18
Engine/source/gui/editor/inspector/dynamicField.h
View file

@ -39,24 +39,24 @@ public:
DECLARE_CONOBJECT( GuiInspectorDynamicField );
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual StringTableEntry getFieldName() { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); }
virtual StringTableEntry getRawFieldName() { return getFieldName(); }
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
StringTableEntry getFieldName() override { return ( mDynField != NULL ) ? mDynField->slotName : StringTable->insert( "" ); }
StringTableEntry getRawFieldName() override { return getFieldName(); }
virtual bool onAdd();
bool onAdd() override;
void renameField( const char* newFieldName );
GuiControl* constructRenameControl();
virtual bool updateRects();
virtual void setInspectorField( AbstractClassRep::Field *field,
bool updateRects() override;
void setInspectorField( AbstractClassRep::Field *field,
StringTableEntry caption = NULL,
const char *arrayIndex = NULL );
const char *arrayIndex = NULL ) override;
protected:
virtual void _executeSelectedCallback();
void _executeSelectedCallback() override;
protected:

6
Engine/source/gui/editor/inspector/dynamicGroup.h
View file

@ -45,8 +45,8 @@ public:
// inspectGroup is overridden in GuiInspectorDynamicGroup to inspect an
// objects FieldDictionary (dynamic fields) instead of regular persistent
// fields.
bool inspectGroup();
virtual void updateAllFields();
bool inspectGroup() override;
void updateAllFields() override;
// For scriptable dynamic field additions
void addDynamicField();
@ -58,7 +58,7 @@ public:
virtual SimFieldDictionary::Entry* findDynamicFieldInDictionary( StringTableEntry fieldName );
protected:
// create our inner controls when we add
virtual bool createContent();
bool createContent() override;
};

14
Engine/source/gui/editor/inspector/variableField.h
View file

@ -45,15 +45,15 @@ public:
DECLARE_CONOBJECT( GuiInspectorVariableField );
DECLARE_CATEGORY( "Gui Editor" );
virtual bool onAdd();
bool onAdd() override;
virtual void setValue( const char* newValue );
virtual const char* getValue() { return NULL; }
virtual void updateValue();
virtual void setData( const char* data, bool callbacks = true );
virtual const char* getData( U32 inspectObjectIndex = 0 );
virtual void updateData() {};
void setValue( const char* newValue ) override;
const char* getValue() override { return NULL; }
void updateValue() override;
void setData( const char* data, bool callbacks = true ) override;
const char* getData( U32 inspectObjectIndex = 0 ) override;
void updateData() override {};
protected:
StringTableEntry mVariableName;

4
Engine/source/gui/editor/inspector/variableGroup.h
View file

@ -67,9 +67,9 @@ public:
DECLARE_CONOBJECT(GuiInspectorVariableGroup);
DECLARE_CATEGORY( "Gui Editor" );
virtual GuiInspectorField* constructField( S32 fieldType );
GuiInspectorField* constructField( S32 fieldType ) override;
virtual bool inspectGroup();
bool inspectGroup() override;
void clearFields();
void addField(VariableField* field);

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

@ -43,7 +43,7 @@ public:
DECLARE_CONOBJECT( GuiVariableInspector );
DECLARE_CATEGORY( "Gui Editor" );
virtual void inspectObject( SimObject *object ) {}
void inspectObject( SimObject *object ) override {}
virtual void loadVars( String searchString );

2
Engine/source/gui/editor/popupMenu.cpp
View file

@ -35,7 +35,7 @@ bool PopupMenu::smSelectionEventHandled = false;
class PopUpNotifyRemoveEvent : public SimEvent
{
public:
void process(SimObject *object)
void process(SimObject *object) override
{
PopupMenu::smPopupMenuEvent.remove((PopupMenu *)object, &PopupMenu::handleSelectEvent);
}

8
Engine/source/gui/editor/popupMenu.h
View file

@ -97,8 +97,8 @@ public:
static void initPersistFields();
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static PopupMenuEvent smPopupMenuEvent;
static bool smSelectionEventHandled; /// Set to true if any menu or submenu handles a selection event
@ -181,8 +181,8 @@ public:
/// it should work regardless of platform.
void handleSelectEvent(U32 popID, U32 command);
virtual bool onMessageReceived(StringTableEntry queue, const char* event, const char* data );
virtual bool onMessageObjectReceived(StringTableEntry queue, Message *msg );
bool onMessageReceived(StringTableEntry queue, const char* event, const char* data ) override;
bool onMessageObjectReceived(StringTableEntry queue, Message *msg ) override;
bool isVisible() { return mVisible; }
void setVisible(bool isVis) { mVisible = isVis; }

6
Engine/source/gui/game/guiChunkedBitmapCtrl.h
View file

@ -32,12 +32,12 @@ public:
static void initPersistFields();
//Parental methods
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
void setBitmap(const char *name);
void onRender(Point2I offset, const RectI &updateRect);
void onRender(Point2I offset, const RectI &updateRect) override;
void onImageChanged() {}
};

12
Engine/source/gui/game/guiFadeinBitmapCtrl.h
View file

@ -69,12 +69,12 @@ class GuiFadeinBitmapCtrl : public GuiBitmapCtrl
GuiFadeinBitmapCtrl();
// GuiControl.
virtual void onPreRender();
virtual void onMouseDown(const GuiEvent &);
virtual bool onKeyDown(const GuiEvent &);
virtual bool onGamepadButtonDown(const GuiEvent& event);
virtual bool onWake();
virtual void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onMouseDown(const GuiEvent &) override;
bool onKeyDown(const GuiEvent &) override;
bool onGamepadButtonDown(const GuiEvent& event) override;
bool onWake() override;
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();

10
Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
View file

@ -53,21 +53,21 @@ public:
doFadeIn = false;
doFadeOut = false;
}
void onPreRender()
void onPreRender() override
{
Parent::onPreRender();
setUpdate();
}
void onMouseDown(const GuiEvent &)
void onMouseDown(const GuiEvent &) override
{
Con::executef(this, "click");
}
bool onKeyDown(const GuiEvent &)
bool onKeyDown(const GuiEvent &) override
{
Con::executef(this, "click");
return true;
}
bool onWake()
bool onWake() override
{
if(!Parent::onWake())
return false;
@ -91,7 +91,7 @@ public:
done = false;
}
void onRender(Point2I offset, const RectI &updateRect)
void onRender(Point2I offset, const RectI &updateRect) override
{
U32 elapsed = Platform::getRealMilliseconds() - wakeTime;

18
Engine/source/gui/game/guiMessageVectorCtrl.h
View file

@ -63,17 +63,17 @@ class GuiMessageVectorCtrl : public GuiControl
// Gui control overrides
protected:
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
bool onWake();
void onSleep();
void onRender(Point2I offset, const RectI &updateRect);
void inspectPostApply();
void parentResized(const RectI& oldParentRect, const RectI& newParentRect);
bool onWake() override;
void onSleep() override;
void onRender(Point2I offset, const RectI &updateRect) override;
void inspectPostApply() override;
void parentResized(const RectI& oldParentRect, const RectI& newParentRect) override;
void onMouseUp(const GuiEvent &event);
void onMouseDown(const GuiEvent &event);
void onMouseUp(const GuiEvent &event) override;
void onMouseDown(const GuiEvent &event) override;
// void onMouseMove(const GuiEvent &event);
// Overrideables

10
Engine/source/gui/game/guiProgressBitmapCtrl.h
View file

@ -70,13 +70,13 @@ class GuiProgressBitmapCtrl : public GuiTextCtrl
void setBitmap( const char* name );
//console related methods
virtual const char *getScriptValue();
virtual void setScriptValue(const char *value);
const char *getScriptValue() override;
void setScriptValue(const char *value) override;
// GuiTextCtrl.
virtual void onPreRender();
virtual void onRender( Point2I offset, const RectI &updateRect );
virtual bool onWake();
void onPreRender() override;
void onRender( Point2I offset, const RectI &updateRect ) override;
bool onWake() override;
DECLARE_CONOBJECT( GuiProgressBitmapCtrl );
DECLARE_CATEGORY( "Gui Values" );

8
Engine/source/gui/game/guiProgressCtrl.h
View file

@ -48,11 +48,11 @@ public:
GuiProgressCtrl();
//console related methods
virtual const char *getScriptValue();
virtual void setScriptValue(const char *value);
const char *getScriptValue() override;
void setScriptValue(const char *value) override;
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
};
#endif

30
Engine/source/gui/shaderEditor/guiShaderEditor.h
View file

@ -111,26 +111,26 @@ public:
DECLARE_CATEGORY("Shader Editor");
DECLARE_DESCRIPTION("Implements a shader node based editor.");
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
static void initPersistFields();
virtual bool onAdd() override;
virtual void onRemove() override;
bool onAdd() override;
void onRemove() override;
virtual void onPreRender() override;
void onPreRender() override;
void drawThickLine(const Point2I& pt1, const Point2I& pt2, U32 thickness = 2, ColorI col1 = ColorI(255, 255, 255), ColorI col2 = ColorI(255, 255, 255));
virtual void onRender(Point2I offset, const RectI& updateRect) override;
void onRender(Point2I offset, const RectI& updateRect) override;
// interaction
virtual bool onKeyDown(const GuiEvent& event) override;
virtual void onMouseDown(const GuiEvent& event) override;
virtual void onMouseUp(const GuiEvent& event) override;
virtual void onMouseDragged(const GuiEvent& event) override;
virtual void onMiddleMouseDown(const GuiEvent& event) override;
virtual void onMiddleMouseUp(const GuiEvent& event) override;
virtual void onMiddleMouseDragged(const GuiEvent& event) override;
virtual bool onMouseWheelUp(const GuiEvent& event) override;
virtual bool onMouseWheelDown(const GuiEvent& event) override;
bool onKeyDown(const GuiEvent& event) override;
void onMouseDown(const GuiEvent& event) override;
void onMouseUp(const GuiEvent& event) override;
void onMouseDragged(const GuiEvent& event) override;
void onMiddleMouseDown(const GuiEvent& event) override;
void onMiddleMouseUp(const GuiEvent& event) override;
void onMiddleMouseDragged(const GuiEvent& event) override;
bool onMouseWheelUp(const GuiEvent& event) override;
bool onMouseWheelDown(const GuiEvent& event) override;
RectI getSelectionBounds();
void deleteSelection();

10
Engine/source/gui/shaderEditor/guiShaderNode.h
View file

@ -138,15 +138,15 @@ public:
GuiShaderNode();
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
static void initPersistFields();
virtual bool onAdd() override;
virtual void onRemove() override;
bool onAdd() override;
void onRemove() override;
void renderNode(Point2I offset, const RectI& updateRect, const S32 nodeSize);
// Serialization functions
void write(Stream& stream, U32 tabStop = 0, U32 flags = 0);
void write(Stream& stream, U32 tabStop = 0, U32 flags = 0) override;
void read(Stream& stream);
// is the parent that all other nodes are derived from.

12
Engine/source/gui/shiny/guiAudioCtrl.h
View file

@ -58,9 +58,9 @@ private:
protected:
// So this can be instantiated and not be a pure virtual class
void interpolateTick( F32 delta ) {};
void processTick();
void advanceTime( F32 timeDelta ) {};
void interpolateTick( F32 delta ) override {};
void processTick() override;
void advanceTime( F32 timeDelta ) override {};
S32 mTickPeriodMS;
U32 mLastThink;
@ -89,9 +89,9 @@ public:
GuiAudioCtrl();
~GuiAudioCtrl();
// GuiControl.
bool onWake();
void onSleep();
void setActive(bool value) {};
bool onWake() override;
void onSleep() override;
void setActive(bool value) override {};
bool testCondition();
static void initPersistFields();
DECLARE_CONOBJECT(GuiAudioCtrl);

8
Engine/source/gui/theora/guiTheoraCtrl.h
View file

@ -110,10 +110,10 @@ class GuiTheoraCtrl : public GuiControl
}
// GuiControl.
virtual bool onWake();
virtual void onSleep();
virtual void onRender( Point2I offset, const RectI &updateRect );
virtual void inspectPostApply();
bool onWake() override;
void onSleep() override;
void onRender( Point2I offset, const RectI &updateRect ) override;
void inspectPostApply() override;
static void initPersistFields();

2
Engine/source/gui/utility/guiBubbleTextCtrl.h
View file

@ -54,7 +54,7 @@ class GuiBubbleTextCtrl : public GuiTextCtrl
GuiBubbleTextCtrl() :mInAction(false), mDlg(NULL), mPopup(NULL), mMLText(NULL) {}
virtual void onMouseDown(const GuiEvent &event);
void onMouseDown(const GuiEvent &event) override;
};
#endif /* _GUI_BUBBLE_TEXT_CONTROL_H_ */

6
Engine/source/gui/utility/guiInputCtrl.h
View file

@ -48,10 +48,10 @@ public:
GuiInputCtrl();
// GuiControl.
virtual bool onWake();
virtual void onSleep();
bool onWake() override;
void onSleep() override;
virtual bool onInputEvent( const InputEventInfo &event );
bool onInputEvent( const InputEventInfo &event ) override;
static void initPersistFields();

18
Engine/source/gui/utility/guiMouseEventCtrl.h
View file

@ -52,15 +52,15 @@ class GuiMouseEventCtrl : public GuiControl
DECLARE_CALLBACK( void, onRightMouseDragged, ( S32 modifier, Point2I mousePoint, S32 mouseClickCount ));
// GuiControl
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);
void onRightMouseDown(const GuiEvent & event);
void onRightMouseUp(const GuiEvent & event);
void onRightMouseDragged(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;
void onRightMouseDown(const GuiEvent & event) override;
void onRightMouseUp(const GuiEvent & event) override;
void onRightMouseDragged(const GuiEvent & event) override;
static void initPersistFields();

4
Engine/source/gui/utility/guiRenderTargetVizCtrl.h
View file

@ -49,8 +49,8 @@ class GuiRenderTargetVizCtrl : public GuiControl
public:
DECLARE_CONOBJECT(GuiRenderTargetVizCtrl);
GuiRenderTargetVizCtrl();
bool onWake();
void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onRender(Point2I offset, const RectI &updateRect) override;
static void initPersistFields();
};

4
Engine/source/gui/utility/messageVector.h
View file

@ -91,8 +91,8 @@ class MessageVector : public SimObject
//-------------------------------------- Internal interface
protected:
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
private:
struct SpectatorRef {

12
Engine/source/gui/worldEditor/creator.h
View file

@ -98,20 +98,20 @@ class CreatorTree : public GuiArrayCtrl
//
void sort();
void clear();
void clear() override;
S32 mTabSize;
S32 mMaxWidth;
S32 mTxtOffset;
// GuiControl
void onMouseDown(const GuiEvent & event);
void onMouseDragged(const GuiEvent & event);
void onMouseUp(const GuiEvent & event);
bool onWake();
void onMouseDown(const GuiEvent & event) override;
void onMouseDragged(const GuiEvent & event) override;
void onMouseUp(const GuiEvent & event) override;
bool onWake() override;
// GuiArrayCtrl
void onRenderCell(Point2I offset, Point2I cell, bool, bool);
void onRenderCell(Point2I offset, Point2I cell, bool, bool) override;
DECLARE_CONOBJECT(CreatorTree);
DECLARE_CATEGORY( "Gui Editor" );

54
Engine/source/gui/worldEditor/guiConvexShapeEditorCtrl.h
View file

@ -55,29 +55,29 @@ public:
DECLARE_CONOBJECT( GuiConvexEditorCtrl );
// SimObject
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
static void initPersistFields();
// GuiControl
virtual bool onWake();
virtual void onSleep();
virtual void setVisible(bool value);
bool onWake() override;
void onSleep() override;
void setVisible(bool value) override;
// EditTSCtrl
bool onKeyDown( const GuiEvent &event );
bool onKeyUp( const GuiEvent &event );
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
void on3DMouseDown( const Gui3DMouseEvent &event );
void on3DMouseUp( const Gui3DMouseEvent &event );
void on3DMouseMove( 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 renderScene(const RectI & updateRect);
void updateGizmo();
bool onKeyDown( const GuiEvent &event ) override;
bool onKeyUp( const GuiEvent &event ) override;
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
void on3DMouseDown( const Gui3DMouseEvent &event ) override;
void on3DMouseUp( const Gui3DMouseEvent &event ) override;
void on3DMouseMove( 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 renderScene(const RectI & updateRect) override;
void updateGizmo() override;
void updateShape( ConvexShape *shape, S32 offsetFace = -1 );
static void synchClientObject( const ConvexShape *serverConvex );
@ -260,8 +260,8 @@ public:
MatrixF mSavedObjToWorld;
Point3F mSavedScale;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
class ConvexEditorTool
@ -311,15 +311,15 @@ public:
ConvexEditorCreateTool( GuiConvexEditorCtrl *editor );
virtual ~ConvexEditorCreateTool() {}
virtual void onActivated( ConvexEditorTool *prevTool );
virtual void onDeactivated( ConvexEditorTool *newTool );
void onActivated( ConvexEditorTool *prevTool ) override;
void onDeactivated( ConvexEditorTool *newTool ) override;
virtual EventResult on3DMouseDown( const Gui3DMouseEvent &event );
virtual EventResult on3DMouseUp( const Gui3DMouseEvent &event );
virtual EventResult on3DMouseMove( const Gui3DMouseEvent &event );
virtual EventResult on3DMouseDragged( const Gui3DMouseEvent &event );
EventResult on3DMouseDown( const Gui3DMouseEvent &event ) override;
EventResult on3DMouseUp( const Gui3DMouseEvent &event ) override;
EventResult on3DMouseMove( const Gui3DMouseEvent &event ) override;
EventResult on3DMouseDragged( const Gui3DMouseEvent &event ) override;
virtual void renderScene(const RectI & updateRect);
void renderScene(const RectI & updateRect) override;
ConvexShape* extrudeShapeFromFace( ConvexShape *shape, S32 face );

50
Engine/source/gui/worldEditor/guiDecalEditorCtrl.h
View file

@ -51,29 +51,29 @@ class GuiDecalEditorCtrl : public EditTSCtrl
DECLARE_CONOBJECT(GuiDecalEditorCtrl);
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
static void consoleInit();
void onEditorDisable();
void onEditorDisable() override;
// GuiControl
virtual bool onWake();
virtual void onSleep();
virtual void onRender(Point2I offset, const RectI &updateRect);
bool onWake() override;
void onSleep() override;
void onRender(Point2I offset, const RectI &updateRect) override;
// EditTSCtrl
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
void on3DMouseDown(const Gui3DMouseEvent & event);
void on3DMouseUp(const Gui3DMouseEvent & event);
void on3DMouseMove(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 updateGuiInfo();
void renderScene(const RectI & updateRect);
void renderGui(Point2I offset, const RectI &updateRect);
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
void on3DMouseDown(const Gui3DMouseEvent & event) override;
void on3DMouseUp(const Gui3DMouseEvent & event) override;
void on3DMouseMove(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() override;
void renderScene(const RectI & updateRect) override;
void renderGui(Point2I offset, const RectI &updateRect) override;
/// Find clicked point on "static collision" objects.
bool getRayInfo( const Gui3DMouseEvent &event, RayInfo *rInfo );
@ -132,8 +132,8 @@ public:
void addDecal(const DecalInstance& decal);
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
//Decal Instance Delete Undo Actions
@ -162,8 +162,8 @@ public:
void deleteDecal(const DecalInstance& decal);
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
//Decal Datablock Delete Undo Actions
@ -191,8 +191,8 @@ public:
void deleteDecal(const DecalInstance& decal);
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
//Decal Datablock Retarget Undo Actions
@ -221,8 +221,8 @@ public:
void retargetDecal( DecalInstance* decal );
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
#endif // _GUIDECALEDITORCTRL_H_

24
Engine/source/gui/worldEditor/guiMissionArea.h
View file

@ -119,20 +119,20 @@ public:
DECLARE_CONOBJECT(GuiMissionAreaCtrl);
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
// GuiControl
void onRender(Point2I offset, const RectI &updateRect);
bool onWake();
void onSleep();
void onRender(Point2I offset, const RectI &updateRect) override;
bool onWake() override;
void onSleep() override;
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);
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 setMissionArea( MissionArea* area );
void updateTerrain();
@ -154,8 +154,8 @@ class GuiMissionAreaUndoAction : public UndoAction
SimObjectId mObjId;
RectI mArea;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
#endif // _GUIMISSIONAREA_H_

4
Engine/source/gui/worldEditor/guiMissionAreaEditor.h
View file

@ -44,11 +44,11 @@ public:
DECLARE_CONOBJECT(GuiMissionAreaEditorCtrl);
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
// EditTSCtrl
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ );
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &event_ ) override;
void setSelectedMissionArea( MissionArea *missionArea );
MissionArea* getSelectedMissionArea() { return mSelMissionArea; };

10
Engine/source/gui/worldEditor/guiTerrPreviewCtrl.h
View file

@ -65,9 +65,9 @@ public:
static void initPersistFields();
//Parental methods
bool onWake();
void onSleep();
bool onAdd();
bool onWake() override;
void onSleep() override;
bool onAdd() override;
void setBitmap(const GFXTexHandle&);
@ -80,8 +80,8 @@ public:
//void setValue(const Point2F *center, const Point2F *camera);
//const char *getScriptValue();
void onPreRender();
void onRender(Point2I offset, const RectI &updateRect);
void onPreRender() override;
void onRender(Point2I offset, const RectI &updateRect) override;
};

86
Engine/source/gui/worldEditor/terrainActions.h
View file

@ -66,28 +66,28 @@ class SelectAction : public TerrainAction
{
public:
SelectAction(TerrainEditor * editor) : TerrainAction(editor){};
StringTableEntry getName(){return("select");}
StringTableEntry getName() override{return("select");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
class DeselectAction : public TerrainAction
{
public:
DeselectAction(TerrainEditor * editor) : TerrainAction(editor){};
StringTableEntry getName(){return("deselect");}
StringTableEntry getName() override{return("deselect");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
class ClearAction : public TerrainAction
{
public:
ClearAction(TerrainEditor * editor) : TerrainAction(editor){};
StringTableEntry getName(){return("clear");}
StringTableEntry getName() override{return("clear");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) {};
bool useMouseBrush() { mTerrainEditor->getCurrentSel()->reset(); return true; }
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override {};
bool useMouseBrush() override { mTerrainEditor->getCurrentSel()->reset(); return true; }
};
@ -95,9 +95,9 @@ class SoftSelectAction : public TerrainAction
{
public:
SoftSelectAction(TerrainEditor * editor) : TerrainAction(editor){};
StringTableEntry getName(){return("softSelect");}
StringTableEntry getName() override{return("softSelect");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
Filter mFilter;
};
@ -108,10 +108,10 @@ class OutlineSelectAction : public TerrainAction
{
public:
OutlineSelectAction(TerrainEditor * editor) : TerrainAction(editor){};
StringTableEntry getName(){return("outlineSelect");}
StringTableEntry getName() override{return("outlineSelect");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
bool useMouseBrush() { return(false); }
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
bool useMouseBrush() override { return(false); }
private:
@ -124,9 +124,9 @@ class PaintMaterialAction : public TerrainAction
{
public:
PaintMaterialAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("paintMaterial");}
StringTableEntry getName() override{return("paintMaterial");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -135,9 +135,9 @@ class ClearMaterialsAction : public TerrainAction
{
public:
ClearMaterialsAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("clearMaterials");}
StringTableEntry getName() override{return("clearMaterials");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -146,9 +146,9 @@ class RaiseHeightAction : public TerrainAction
{
public:
RaiseHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("raiseHeight");}
StringTableEntry getName() override{return("raiseHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -157,9 +157,9 @@ class LowerHeightAction : public TerrainAction
{
public:
LowerHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("lowerHeight");}
StringTableEntry getName() override{return("lowerHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -168,9 +168,9 @@ class SetHeightAction : public TerrainAction
{
public:
SetHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("setHeight");}
StringTableEntry getName() override{return("setHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -179,9 +179,9 @@ class SetEmptyAction : public TerrainAction
{
public:
SetEmptyAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("setEmpty");}
StringTableEntry getName() override{return("setEmpty");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -190,9 +190,9 @@ class ClearEmptyAction : public TerrainAction
{
public:
ClearEmptyAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("clearEmpty");}
StringTableEntry getName() override{return("clearEmpty");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -201,9 +201,9 @@ class ScaleHeightAction : public TerrainAction
{
public:
ScaleHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("scaleHeight");}
StringTableEntry getName() override{return("scaleHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
//------------------------------------------------------------------------------
@ -212,9 +212,9 @@ class BrushAdjustHeightAction : public TerrainAction
{
public:
BrushAdjustHeightAction(TerrainEditor* editor) : TerrainAction(editor) { mPreviousZ = 0.0f; }
StringTableEntry getName(){return("brushAdjustHeight");}
StringTableEntry getName() override{return("brushAdjustHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
private:
PlaneF mIntersectionPlane;
@ -226,10 +226,10 @@ class AdjustHeightAction : public BrushAdjustHeightAction
{
public:
AdjustHeightAction(TerrainEditor * editor);
StringTableEntry getName(){return("adjustHeight");}
StringTableEntry getName() override{return("adjustHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
bool useMouseBrush() { return(false); }
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
bool useMouseBrush() override { return(false); }
private:
//
@ -244,27 +244,27 @@ class FlattenHeightAction : public TerrainAction
{
public:
FlattenHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("flattenHeight");}
StringTableEntry getName() override{return("flattenHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
class SmoothHeightAction : public TerrainAction
{
public:
SmoothHeightAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("smoothHeight");}
StringTableEntry getName() override{return("smoothHeight");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
class SmoothSlopeAction : public TerrainAction
{
public:
SmoothSlopeAction(TerrainEditor * editor) : TerrainAction(editor){}
StringTableEntry getName(){return("smoothSlope");}
StringTableEntry getName() override{return("smoothSlope");}
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type);
void process(Selection * sel, const Gui3DMouseEvent & event, bool selChanged, Type type) override;
};
class PaintNoiseAction : public TerrainAction
@ -285,9 +285,9 @@ class PaintNoiseAction : public TerrainAction
mScale = 1.5f / ( mMinMaxNoise.x - mMinMaxNoise.y);
}
StringTableEntry getName() { return "paintNoise"; }
StringTableEntry getName() override { return "paintNoise"; }
void process( Selection *sel, const Gui3DMouseEvent &event, bool selChanged, Type type );
void process( Selection *sel, const Gui3DMouseEvent &event, bool selChanged, Type type ) override;
protected:
@ -348,8 +348,8 @@ public:
static void initPersistFields();
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
/// Performs the initial smoothing and stores
/// the heighfield state for later undo.

2
Engine/source/gui/worldEditor/terrainEditor.cpp
View file

@ -1741,7 +1741,7 @@ public:
{
mSequence = seq;
}
void process(SimObject *object)
void process(SimObject *object) override
{
((TerrainEditor *) object)->processActionTick(mSequence);
}

62
Engine/source/gui/worldEditor/terrainEditor.h
View file

@ -143,12 +143,12 @@ public:
BoxBrush(TerrainEditor * editor) : Brush(editor){}
const char *getType() const { return "box"; }
void rebuild();
const char *getType() const override { return "box"; }
void rebuild() override;
protected:
void _renderOutline();
void _renderOutline() override;
};
class EllipseBrush : public Brush
@ -157,12 +157,12 @@ public:
EllipseBrush(TerrainEditor * editor) : Brush(editor){}
const char *getType() const { return "ellipse"; }
void rebuild();
const char *getType() const override { return "ellipse"; }
void rebuild() override;
protected:
void _renderOutline();
void _renderOutline() override;
};
class SelectionBrush : public Brush
@ -171,14 +171,14 @@ public:
SelectionBrush(TerrainEditor * editor);
const char *getType() const { return "selection"; }
void rebuild();
const char *getType() const override { return "selection"; }
void rebuild() override;
void render(Vector<GFXVertexPCT> & vertexBuffer, S32 & verts, S32 & elems, S32 & prims, const LinearColorF & inColorFull, const LinearColorF & inColorNone, const LinearColorF & outColorFull, const LinearColorF & outColorNone) const;
void setSize(const Point2I &){}
void setSize(const Point2I &) override{}
protected:
void _renderOutline() {}
void _renderOutline() override {}
};
@ -217,7 +217,7 @@ class TerrainEditor : public EditTSCtrl
void mirrorTerrain(S32 mirrorIndex);
TerrainBlock* getActiveTerrain() { return mActiveTerrain; };
TerrainBlock* getActiveTerrain() override { return mActiveTerrain; };
void scheduleGridUpdate() { mNeedsGridUpdate = true; }
void scheduleMaterialUpdate() { mNeedsMaterialUpdate = true; }
@ -291,8 +291,8 @@ class TerrainEditor : public EditTSCtrl
Selection *mSel;
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
void submitUndo( Selection *sel );
@ -315,8 +315,8 @@ class TerrainEditor : public EditTSCtrl
Vector<U8> mLayerMap;
Vector<TerrainMaterial*> mMaterials;
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
bool mIsDirty; // dirty flag for writing terrain.
@ -452,28 +452,28 @@ class TerrainEditor : public EditTSCtrl
public:
// SimObject
bool onAdd();
void onDeleteNotify(SimObject * object);
bool onAdd() override;
void onDeleteNotify(SimObject * object) override;
static void initPersistFields();
// GuiControl
bool onWake();
void onSleep();
bool onWake() override;
void onSleep() override;
// EditTSCtrl
bool onInputEvent( const InputEventInfo & evt );
void on3DMouseUp( const Gui3DMouseEvent & evt );
void on3DMouseDown( const Gui3DMouseEvent & evt );
void on3DMouseMove( const Gui3DMouseEvent & evt );
void on3DMouseDragged( const Gui3DMouseEvent & evt );
bool onMouseWheelUp( const GuiEvent & evt );
bool onMouseWheelDown( const GuiEvent & evt );
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &evt );
void onPreRender();
void renderScene(const RectI & updateRect);
void renderGui( Point2I offset, const RectI &updateRect );
void updateGuiInfo();
bool onInputEvent( const InputEventInfo & evt ) override;
void on3DMouseUp( const Gui3DMouseEvent & evt ) override;
void on3DMouseDown( const Gui3DMouseEvent & evt ) override;
void on3DMouseMove( const Gui3DMouseEvent & evt ) override;
void on3DMouseDragged( const Gui3DMouseEvent & evt ) override;
bool onMouseWheelUp( const GuiEvent & evt ) override;
bool onMouseWheelDown( const GuiEvent & evt ) override;
void get3DCursor( GuiCursor *&cursor, bool &visible, const Gui3DMouseEvent &evt ) override;
void onPreRender() override;
void renderScene(const RectI & updateRect) override;
void renderGui( Point2I offset, const RectI &updateRect ) override;
void updateGuiInfo() override;
// Determine if the given grid point is valid within a non-wrap
// around terrain.

4
Engine/source/gui/worldEditor/tools/editorTool.h
View file

@ -53,8 +53,8 @@ public:
DECLARE_CONOBJECT(EditorTool);
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
//Called when the tool is activated on the World Editor
virtual void onActivated(WorldEditor*);

12
Engine/source/gui/worldEditor/undoActions.h
View file

@ -67,8 +67,8 @@ public:
void addObject( SimObject *object );
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
@ -106,8 +106,8 @@ public:
void deleteObject( const Vector<SimObject*> &objectList );
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
class InspectorFieldUndoAction : public UndoAction
@ -130,8 +130,8 @@ public:
String mData;
// UndoAction
virtual void undo();
virtual void redo() { undo(); }
void undo() override;
void redo() override { undo(); }
};
#endif // _GUI_WORLDEDITOR_UNDOACTIONS_H_

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

@ -137,9 +137,9 @@ class WorldEditorSelection : public SimPersistSet
void invalidateCentroid() { mCentroidValid = false; }
// SimSet.
virtual void addObject( SimObject* );
virtual void removeObject( SimObject* );
virtual void setCanSave( bool value );
void addObject( SimObject* ) override;
void removeObject( SimObject* ) override;
void setCanSave( bool value ) override;
static void initPersistFields();