TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +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

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();