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

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

8
Engine/source/forest/editor/forestBrushElement.h
View file

@ -109,9 +109,9 @@ public:
DECLARE_CONOBJECT( ForestBrush );
virtual bool onAdd();
bool onAdd() override;
virtual void addObject(SimObject*);
void addObject(SimObject*) override;
static SimGroup* getGroup();
@ -135,9 +135,9 @@ public:
DECLARE_CONOBJECT(ForestBrushGroup);
virtual bool onAdd();
bool onAdd() override;
virtual void addObject(SimObject*);
void addObject(SimObject*) override;
bool containsBrushData(const ForestBrush* inData);
protected:

26
Engine/source/forest/editor/forestBrushTool.h
View file

@ -62,20 +62,20 @@ public:
// SimObject
DECLARE_CONOBJECT( ForestBrushTool );
static void initPersistFields();
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
// ForestTool
virtual void on3DMouseDown( const Gui3DMouseEvent &evt );
virtual void on3DMouseUp( const Gui3DMouseEvent &evt );
virtual void on3DMouseMove( const Gui3DMouseEvent &evt );
virtual void on3DMouseDragged( const Gui3DMouseEvent &evt );
virtual bool onMouseWheel(const GuiEvent &evt );
virtual void onRender3D();
virtual void onRender2D();
virtual void onActivated( const Gui3DMouseEvent &lastEvent );
virtual void onDeactivated();
virtual bool updateGuiInfo();
void on3DMouseDown( const Gui3DMouseEvent &evt ) override;
void on3DMouseUp( const Gui3DMouseEvent &evt ) override;
void on3DMouseMove( const Gui3DMouseEvent &evt ) override;
void on3DMouseDragged( const Gui3DMouseEvent &evt ) override;
bool onMouseWheel(const GuiEvent &evt ) override;
void onRender3D() override;
void onRender2D() override;
void onActivated( const Gui3DMouseEvent &lastEvent ) override;
void onDeactivated() override;
bool updateGuiInfo() override;
// ForestBrushTool
void setSize( F32 val );
@ -139,7 +139,7 @@ class ForestBrushToolEvent : public SimEvent
{
public:
void process( SimObject *object )
void process( SimObject *object ) override
{
((ForestBrushTool*)object)->_onStroke();
}

38
Engine/source/forest/editor/forestEditorCtrl.h
View file

@ -58,30 +58,30 @@ class ForestEditorCtrl : public EditTSCtrl
DECLARE_CONOBJECT( ForestEditorCtrl );
// SimObject
bool onAdd();
bool onAdd() override;
static void initPersistFields();
// GuiControl
virtual bool onWake();
virtual void onSleep();
virtual void onMouseUp( const GuiEvent &event_ );
bool onWake() override;
void onSleep() override;
void onMouseUp( const GuiEvent &event_ ) 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_ );
bool onMouseWheelUp(const GuiEvent &event_);
bool onMouseWheelDown(const GuiEvent &event_);
void updateGuiInfo();
void updateGizmo();
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;
bool onMouseWheelUp(const GuiEvent &event_) override;
bool onMouseWheelDown(const GuiEvent &event_) override;
void updateGuiInfo() override;
void updateGizmo() override;
void renderScene( const RectI &updateRect ) override;
void renderGui( Point2I offset, const RectI &updateRect ) override;
/// Causes the editor to reselect the active forest.
bool updateActiveForest( bool createNew );

28
Engine/source/forest/editor/forestSelectionTool.h
View file

@ -47,9 +47,9 @@ public:
protected:
void offsetObject( ForestItem &object, const Point3F &delta );
void rotateObject( ForestItem &object, const EulerF &delta, const Point3F &origin );
void scaleObject( ForestItem &object, const Point3F &delta );
void offsetObject( ForestItem &object, const Point3F &delta ) override;
void rotateObject( ForestItem &object, const EulerF &delta, const Point3F &origin ) override;
void scaleObject( ForestItem &object, const Point3F &delta ) override;
protected:
@ -93,17 +93,17 @@ class ForestSelectionTool : public ForestTool
DECLARE_CONOBJECT( ForestSelectionTool );
// ForestTool
virtual void setParentEditor( ForestEditorCtrl *editor );
virtual void setActiveForest( Forest *forest );
virtual void on3DMouseDown( const Gui3DMouseEvent &evt );
virtual void on3DMouseUp( const Gui3DMouseEvent &evt );
virtual void on3DMouseMove( const Gui3DMouseEvent &evt );
virtual void on3DMouseDragged( const Gui3DMouseEvent &evt );
virtual void onRender3D();
virtual void onRender2D();
virtual bool updateGuiInfo();
virtual void updateGizmo();
virtual void onUndoAction();
void setParentEditor( ForestEditorCtrl *editor ) override;
void setActiveForest( Forest *forest ) override;
void on3DMouseDown( const Gui3DMouseEvent &evt ) override;
void on3DMouseUp( const Gui3DMouseEvent &evt ) override;
void on3DMouseMove( const Gui3DMouseEvent &evt ) override;
void on3DMouseDragged( const Gui3DMouseEvent &evt ) override;
void onRender3D() override;
void onRender2D() override;
bool updateGuiInfo() override;
void updateGizmo() override;
void onUndoAction() override;
S32 getSelectionCount() const { return mSelection.size(); }

16
Engine/source/forest/editor/forestUndo.h
View file

@ -45,8 +45,8 @@ public:
ForestUndoAction( const Resource<ForestData> &data, ForestEditorCtrl *editor, const char *description );
// UndoAction
virtual void undo() {}
virtual void redo() {}
void undo() override {}
void redo() override {}
protected:
@ -72,8 +72,8 @@ public:
F32 scale );
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
@ -91,8 +91,8 @@ public:
void removeItem( const Vector<ForestItem> &itemList );
// UndoAction
virtual void undo();
virtual void redo();
void undo() override;
void redo() override;
};
@ -107,8 +107,8 @@ public:
void saveItem( const ForestItem &item );
virtual void undo() { _swapState(); }
virtual void redo() { _swapState(); }
void undo() override { _swapState(); }
void redo() override { _swapState(); }
protected: