TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-28 07:45:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtuals removed

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

6
Engine/source/scene/mixin/sceneAmbientSoundObject.h
View file

@ -58,11 +58,11 @@ class SceneAmbientSoundObject : public Base
static void initPersistFields();
// NetObject.
virtual U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream );
virtual void unpackUpdate( NetConnection* connection, BitStream* stream );
U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override;
void unpackUpdate( NetConnection* connection, BitStream* stream ) override;
// SceneObject.
virtual SFXAmbience* getSoundAmbience() const { return mSoundAmbience; }
SFXAmbience* getSoundAmbience() const override { return mSoundAmbience; }
private:

16
Engine/source/scene/mixin/scenePolyhedralObject.h
View file

@ -75,7 +75,7 @@ class ScenePolyhedralObject : public Base, public IScenePolyhedralObject
PolyhedronType mPolyhedron;
///
virtual void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat );
void _renderObject( ObjectRenderInst* ri, SceneRenderState* state, BaseMatInstance* overrideMat ) override;
public:
@ -90,21 +90,21 @@ class ScenePolyhedralObject : public Base, public IScenePolyhedralObject
const PolyhedronType& getPolyhedron() const { return mPolyhedron; }
// SimObject.
virtual bool onAdd();
virtual void writeFields( Stream& stream, U32 tabStop );
virtual bool writeField( StringTableEntry name, const char* value );
bool onAdd() override;
void writeFields( Stream& stream, U32 tabStop ) override;
bool writeField( StringTableEntry name, const char* value ) override;
static void initPersistFields();
// NetObject.
virtual U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream );
virtual void unpackUpdate( NetConnection* connection, BitStream* stream );
U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override;
void unpackUpdate( NetConnection* connection, BitStream* stream ) override;
// SceneObject.
virtual bool containsPoint( const Point3F& point );
bool containsPoint( const Point3F& point ) override;
// IScenePolyhedralObject.
virtual AnyPolyhedron ToAnyPolyhedron() const { return getPolyhedron(); }
AnyPolyhedron ToAnyPolyhedron() const override { return getPolyhedron(); }
private:

16
Engine/source/scene/reflector.h
View file

@ -70,9 +70,9 @@ public:
static void initPersistFields();
virtual void packData( BitStream *stream );
virtual void unpackData( BitStream* stream );
virtual bool preload( bool server, String &errorStr );
void packData( BitStream *stream ) override;
void unpackData( BitStream* stream ) override;
bool preload( bool server, String &errorStr ) override;
U32 texSize;
F32 nearDist;
@ -150,7 +150,7 @@ public:
void registerReflector( SceneObject *inObject,
ReflectorDesc *inDesc );
virtual void unregisterReflector();
void unregisterReflector() override;
virtual void updateReflection( const ReflectParams &params, Point3F explicitPostion = Point3F::Max);
GFXCubemap* getCubemap() const { return mCubemap; }
@ -174,8 +174,8 @@ protected:
U32 faceIdx;
CubeReflector *cube;
virtual void updateReflection( const ReflectParams &params ) { cube->updateFace( params, faceIdx ); }
virtual F32 calcScore( const ReflectParams &params );
void updateReflection( const ReflectParams &params ) override { cube->updateFace( params, faceIdx ); }
F32 calcScore( const ReflectParams &params ) override;
};
CubeFaceReflector mFaces[6];
@ -200,8 +200,8 @@ public:
void registerReflector( SceneObject *inObject,
ReflectorDesc *inDesc );
virtual F32 calcScore( const ReflectParams &params );
virtual void updateReflection( const ReflectParams &params );
F32 calcScore( const ReflectParams &params ) override;
void updateReflection( const ReflectParams &params ) override;
/// Set up the GFX matrices
void setGFXMatrices( const MatrixF &camTrans );

26
Engine/source/scene/sceneObject.h
View file

@ -497,7 +497,7 @@ class SceneObject : public NetObject, public ProcessObject
/// it is removed entirely from collisions, it is not ghosted and is
/// essentially "non existant" as far as simulation is concerned.
/// @param hidden True if object is to be hidden
virtual void setHidden( bool hidden );
void setHidden( bool hidden ) override;
/// Builds a convex hull for this object.
///
@ -732,22 +732,22 @@ class SceneObject : public NetObject, public ProcessObject
ProcessList* getProcessList() const;
// ProcessObject,
virtual void processAfter( ProcessObject *obj );
virtual void clearProcessAfter();
virtual ProcessObject* getAfterObject() const { return mAfterObject; }
virtual void setProcessTick( bool t );
void processAfter( ProcessObject *obj ) override;
void clearProcessAfter() override;
ProcessObject* getAfterObject() const override { return mAfterObject; }
void setProcessTick( bool t ) override;
// NetObject.
virtual U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream );
virtual void unpackUpdate( NetConnection* conn, BitStream* stream );
virtual void onCameraScopeQuery( NetConnection* connection, CameraScopeQuery* query );
U32 packUpdate( NetConnection* conn, U32 mask, BitStream* stream ) override;
void unpackUpdate( NetConnection* conn, BitStream* stream ) override;
void onCameraScopeQuery( NetConnection* connection, CameraScopeQuery* query ) override;
// SimObject.
virtual bool onAdd();
virtual void onRemove();
virtual void onDeleteNotify( SimObject *object );
virtual void inspectPostApply();
virtual bool writeField( StringTableEntry fieldName, const char* value );
bool onAdd() override;
void onRemove() override;
void onDeleteNotify( SimObject *object ) override;
void inspectPostApply() override;
bool writeField( StringTableEntry fieldName, const char* value ) override;
static void initPersistFields();

16
Engine/source/scene/sceneSpace.h
View file

@ -64,20 +64,20 @@ class SceneSpace : public SceneObject
~SceneSpace();
// SimObject.
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
// SceneObject.
virtual void setTransform( const MatrixF &mat );
virtual void prepRenderImage( SceneRenderState* state );
void setTransform( const MatrixF &mat ) override;
void prepRenderImage( SceneRenderState* state ) override;
// NetObject.
virtual U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream );
virtual void unpackUpdate( NetConnection* connection, BitStream* stream );
U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override;
void unpackUpdate( NetConnection* connection, BitStream* stream ) override;
// SimObject.
virtual void onEditorEnable();
virtual void onEditorDisable();
void onEditorEnable() override;
void onEditorDisable() override;
};
#endif // !_SCENESPACE_H_

26
Engine/source/scene/simPath.h
View file

@ -68,15 +68,15 @@ class Path : public GameBase
S32 mMinDelay;
S32 mMaxDelay;
protected:
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
public:
Path();
~Path();
void addObject(SimObject*);
void removeObject(SimObject*);
void addObject(SimObject*) override;
void removeObject(SimObject*) override;
void sortMarkers();
void updatePath();
@ -130,16 +130,16 @@ class Marker : public SceneObject
// Rendering
protected:
void prepRenderImage(SceneRenderState *state);
void prepRenderImage(SceneRenderState *state) override;
void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* overrideMat);
protected:
bool onAdd();
void onRemove();
void onGroupAdd();
bool onAdd() override;
void onRemove() override;
void onGroupAdd() override;
void onEditorEnable();
void onEditorDisable();
void onEditorEnable() override;
void onEditorDisable() override;
static void initGFXResources();
@ -154,10 +154,10 @@ class Marker : public SceneObject
DECLARE_CONOBJECT(Marker);
DECLARE_CATEGORY("Cinematic");
static void initPersistFields();
void inspectPostApply();
void inspectPostApply() override;
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
};
typedef Marker::SmoothingType MarkerSmoothingType;

8
Engine/source/scene/zones/scenePolyhedralZone.h
View file

@ -61,7 +61,7 @@ class ScenePolyhedralZone : public ScenePolyhedralObject< SceneSimpleZone >
}
// SceneSimpleZone.
virtual void _updateOrientedWorldBox();
void _updateOrientedWorldBox() override;
public:
@ -69,13 +69,13 @@ class ScenePolyhedralZone : public ScenePolyhedralObject< SceneSimpleZone >
ScenePolyhedralZone( const PolyhedronType& polyhedron );
// SimObject.
virtual bool onAdd();
bool onAdd() override;
// SceneObject.
virtual void setTransform( const MatrixF& mat );
void setTransform( const MatrixF& mat ) override;
// SceneZoneSpace.
virtual bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones );
bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones ) override;
};
#endif // !_SCENEPOLYHEDRALZONE_H_

12
Engine/source/scene/zones/sceneRootZone.h
View file

@ -46,24 +46,24 @@ class SceneRootZone : public SceneSimpleZone
protected:
// SceneObject.
virtual bool onSceneAdd();
virtual void onSceneRemove();
bool onSceneAdd() override;
void onSceneRemove() override;
public:
SceneRootZone();
// SimObject.
virtual bool onAdd();
virtual void onRemove();
virtual String describeSelf() const;
bool onAdd() override;
void onRemove() override;
String describeSelf() const override;
// SceneObject.
virtual bool containsPoint( const Point3F &point ) const;
// SceneZoneSpace.
virtual U32 getPointZone( const Point3F &p ) const;
virtual bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones );
bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones ) override;
};
#endif //_SCENEROOTZONE_H_

22
Engine/source/scene/zones/sceneSimpleZone.h
View file

@ -86,7 +86,7 @@ class SceneSimpleZone : public SceneZoneSpace
virtual void _updateOrientedWorldBox() { mOrientedWorldBox.set( getTransform(), getScale() ); }
// SceneObject.
virtual bool onSceneAdd();
bool onSceneAdd() override;
public:
@ -115,24 +115,24 @@ class SceneSimpleZone : public SceneZoneSpace
/// @{
// SimObject.
virtual String describeSelf() const;
String describeSelf() const override;
static void initPersistFields();
// NetObject
virtual U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );
virtual void unpackUpdate( NetConnection *conn, BitStream *stream );
U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream ) override;
void unpackUpdate( NetConnection *conn, BitStream *stream ) override;
// SceneObject
virtual void prepRenderImage( SceneRenderState* state );
virtual void setTransform( const MatrixF& mat );
void prepRenderImage( SceneRenderState* state ) override;
void setTransform( const MatrixF& mat ) override;
// SceneZoneSpace.
virtual U32 getPointZone( const Point3F &p );
virtual bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones );
virtual void traverseZones( SceneTraversalState* state );
virtual bool getZoneAmbientLightColor( U32 zone, LinearColorF& outColor ) const;
virtual void traverseZones( SceneTraversalState* state, U32 startZoneId );
U32 getPointZone( const Point3F &p ) override;
bool getOverlappingZones( const Box3F& aabb, U32* outZones, U32& outNumZones ) override;
void traverseZones( SceneTraversalState* state ) override;
bool getZoneAmbientLightColor( U32 zone, LinearColorF& outColor ) const override;
void traverseZones( SceneTraversalState* state, U32 startZoneId ) override;
/// @}

8
Engine/source/scene/zones/sceneZoneSpace.h
View file

@ -177,7 +177,7 @@ class SceneZoneSpace : public SceneSpace
/// @}
// SceneObject.
virtual void onSceneRemove();
void onSceneRemove() override;
public:
@ -282,13 +282,13 @@ class SceneZoneSpace : public SceneSpace
/// @}
// SimObject.
virtual bool writeField( StringTableEntry fieldName, const char* value );
bool writeField( StringTableEntry fieldName, const char* value ) override;
static void initPersistFields();
// NetObject.
virtual U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream );
virtual void unpackUpdate( NetConnection* connection, BitStream* stream );
U32 packUpdate( NetConnection* connection, U32 mask, BitStream* stream ) override;
void unpackUpdate( NetConnection* connection, BitStream* stream ) override;
private: