TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

4
Engine/source/T3D/fx/cameraFXMgr.h
View file

@ -80,9 +80,9 @@ public:
void setFalloff( F32 falloff ){ mFalloff = falloff; }
void setFrequency( VectorF &freq ){ mFreq = freq; }
void setAmplitude( VectorF &amp ){ mStartAmp = amp; }
bool isExpired();
bool isExpired() override;
virtual void update( F32 dt );
void update( F32 dt ) override;
};

26
Engine/source/T3D/fx/explosion.h
View file

@ -132,16 +132,16 @@ class ExplosionData : public GameBaseData {
ExplosionData();
DECLARE_CONOBJECT(ExplosionData);
bool onAdd();
bool preload(bool server, String &errorStr);
bool onAdd() override;
bool preload(bool server, String &errorStr) override;
static void initPersistFields();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
public:
/*C*/ ExplosionData(const ExplosionData&, bool = false);
/*D*/ ~ExplosionData();
ExplosionData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
void onShapeChanged() {}
};
@ -175,12 +175,12 @@ class Explosion : public GameBase, public ISceneLight
U32 mCollideType;
protected:
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
bool explode();
void processTick(const Move *move);
void advanceTime(F32 dt);
void processTick(const Move *move) override;
void advanceTime(F32 dt) override;
void updateEmitters( F32 dt );
void launchDebris( Point3F &axis );
void spawnSubExplosions();
@ -188,7 +188,7 @@ class Explosion : public GameBase, public ISceneLight
// Rendering
protected:
void prepRenderImage( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
void prepBatchRender(SceneRenderState *state);
void prepModelView(SceneRenderState*);
@ -198,10 +198,10 @@ class Explosion : public GameBase, public ISceneLight
void setInitialState(const Point3F& point, const Point3F& normal, const F32 fade = 1.0);
// ISceneLight
virtual void submitLights( LightManager *lm, bool staticLighting );
virtual LightInfo* getLight() { return mLight; }
void submitLights( LightManager *lm, bool staticLighting ) override;
LightInfo* getLight() override { return mLight; }
bool onNewDataBlock( GameBaseData *dptr, bool reload );
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
void setCollideType( U32 cType ){ mCollideType = cType; }
DECLARE_CONOBJECT(Explosion);

12
Engine/source/T3D/fx/fxFoliageReplicator.h
View file

@ -246,16 +246,16 @@ public:
void HideReplication(void);
// SceneObject
virtual void prepRenderImage( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
// SimObject
bool onAdd();
void onRemove();
void inspectPostApply();
bool onAdd() override;
void onRemove() override;
void inspectPostApply() override;
// NetObject
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;
// Editor
void onGhostAlwaysDone();

14
Engine/source/T3D/fx/fxShapeReplicator.h
View file

@ -56,7 +56,7 @@ public:
~fxShapeReplicatedStatic() {};
void touchNetFlags(const U32 m, bool setflag = true) { if (setflag) mNetFlags.set(m); else mNetFlags.clear(m); };
TSShape* getShape(void) { return mShapeInstance->getShape(); };
void setTransform(const MatrixF & mat) { Parent::setTransform(mat); setRenderTransform(mat); };
void setTransform(const MatrixF & mat) override { Parent::setTransform(mat); setRenderTransform(mat); };
DECLARE_CONOBJECT(fxShapeReplicatedStatic);
DECLARE_CATEGORY("UNLISTED");
@ -102,16 +102,16 @@ public:
void renderPlacementArea(const F32 ElapsedTime);
// SceneObject
virtual void prepRenderImage( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
// SimObject
bool onAdd();
void onRemove();
void inspectPostApply();
bool onAdd() override;
void onRemove() override;
void inspectPostApply() override;
// NetObject
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;
// Editor
void onGhostAlwaysDone();

18
Engine/source/T3D/fx/groundCover.h
View file

@ -93,11 +93,11 @@ public:
GroundCoverShaderConstHandles();
virtual void init( GFXShader *shader );
void init( GFXShader *shader ) override;
virtual void setConsts( SceneRenderState *state,
void setConsts( SceneRenderState *state,
const SceneData &sgData,
GFXShaderConstBuffer *buffer );
GFXShaderConstBuffer *buffer ) override;
GroundCover *mGroundCover;
@ -128,16 +128,16 @@ public:
static void consoleInit();
static void initPersistFields();
bool onAdd();
void onRemove();
void inspectPostApply();
bool onAdd() override;
void onRemove() override;
void inspectPostApply() override;
// Network
U32 packUpdate( NetConnection *, U32 mask, BitStream *stream );
void unpackUpdate( NetConnection *, BitStream *stream );
U32 packUpdate( NetConnection *, U32 mask, BitStream *stream ) override;
void unpackUpdate( NetConnection *, BitStream *stream ) override;
// Rendering
void prepRenderImage( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
// Editor
void onTerrainUpdated( U32 flags, TerrainBlock *tblock, const Point2I& min, const Point2I& max );

8
Engine/source/T3D/fx/lightning.cpp
View file

@ -131,10 +131,10 @@ class LightningStrikeEvent : public NetEvent
LightningStrikeEvent();
~LightningStrikeEvent();
void pack(NetConnection*, BitStream*);
void write(NetConnection*, BitStream*){}
void unpack(NetConnection*, BitStream*);
void process(NetConnection*);
void pack(NetConnection*, BitStream*) override;
void write(NetConnection*, BitStream*) override{}
void unpack(NetConnection*, BitStream*) override;
void process(NetConnection*) override;
DECLARE_CONOBJECT(LightningStrikeEvent);
};

26
Engine/source/T3D/fx/lightning.h
View file

@ -80,15 +80,15 @@ class LightningData : public GameBaseData
U32 mNumStrikeTextures;
protected:
bool onAdd();
bool onAdd() override;
public:
LightningData();
~LightningData();
void packData(BitStream*);
void unpackData(BitStream*);
bool preload(bool server, String &errorStr);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr) override;
DECLARE_CONOBJECT(LightningData);
static void initPersistFields();
@ -162,9 +162,9 @@ class Lightning : public GameBase
typedef GameBase Parent;
protected:
bool onAdd();
void onRemove();
bool onNewDataBlock( GameBaseData *dptr, bool reload );
bool onAdd() override;
void onRemove() override;
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
DECLARE_CALLBACK( void, applyDamage, ( const Point3F& hitPosition, const Point3F& hitNormal, SceneObject* hitObject ));
@ -206,13 +206,13 @@ class Lightning : public GameBase
protected:
// Rendering
void prepRenderImage(SceneRenderState *state);
void prepRenderImage(SceneRenderState *state) override;
void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* );
// Time management
void processTick(const Move *move);
void interpolateTick(F32 delta);
void advanceTime(F32 dt);
void processTick(const Move *move) override;
void interpolateTick(F32 delta) override;
void advanceTime(F32 dt) override;
// Strike management
void scheduleThunder(Strike*);
@ -242,8 +242,8 @@ class Lightning : public GameBase
DECLARE_CATEGORY("Environment \t Weather");
static void initPersistFields();
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;
};
#endif // _H_LIGHTNING

14
Engine/source/T3D/fx/particle.h
View file

@ -101,18 +101,18 @@ public:
// move this procedure to Particle
void initializeParticle(Particle*, const Point3F&);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
bool preload(bool server, String &errorStr);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() override;
bool preload(bool server, String &errorStr) override;
DECLARE_CONOBJECT(ParticleData);
static void initPersistFields();
bool reload(char errorBuffer[256]);
public:
/*C*/ ParticleData(const ParticleData&, bool = false);
virtual void onPerformSubstitutions();
virtual bool allowSubstitutions() const { return true; }
void onPerformSubstitutions() override;
bool allowSubstitutions() const override { return true; }
protected:
F32 spinBias;
bool randomizeSpinDir;
@ -160,4 +160,4 @@ struct Particle
};
#endif // _PARTICLE_H_
#endif // _PARTICLE_H_

22
Engine/source/T3D/fx/particleEmitter.h
View file

@ -69,10 +69,10 @@ class ParticleEmitterData : public GameBaseData
ParticleEmitterData();
DECLARE_CONOBJECT(ParticleEmitterData);
static void initPersistFields();
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool preload(bool server, String &errorStr);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool preload(bool server, String &errorStr) override;
bool onAdd() override;
void allocPrimBuffer( S32 overrideSize = -1 );
public:
@ -147,7 +147,7 @@ public:
/*C*/ ParticleEmitterData(const ParticleEmitterData&, bool = false);
/*D*/ ~ParticleEmitterData();
virtual ParticleEmitterData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
virtual bool allowSubstitutions() const { return true; }
bool allowSubstitutions() const override { return true; }
};
//*****************************************************************************
@ -184,7 +184,7 @@ class ParticleEmitter : public GameBase
void setColors( LinearColorF *colorList );
ParticleEmitterData *getDataBlock(){ return mDataBlock; }
bool onNewDataBlock( GameBaseData *dptr, bool reload );
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
/// By default, a particle renderer will wait for it's owner to delete it. When this
/// is turned on, it will delete itself as soon as it's particle count drops to zero.
@ -259,15 +259,15 @@ class ParticleEmitter : public GameBase
/// @}
protected:
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
void processTick(const Move *move);
void advanceTime(F32 dt);
void processTick(const Move *move) override;
void advanceTime(F32 dt) override;
// Rendering
protected:
void prepRenderImage( SceneRenderState *state );
void prepRenderImage( SceneRenderState *state ) override;
void copyToVB( const Point3F &camPos, const LinearColorF &ambientColor );
// PEngine interface

24
Engine/source/T3D/fx/particleEmitterNode.h
View file

@ -38,7 +38,7 @@ class ParticleEmitterNodeData : public GameBaseData
typedef GameBaseData Parent;
protected:
bool onAdd();
bool onAdd() override;
//-------------------------------------- Console set variables
public:
@ -51,9 +51,9 @@ class ParticleEmitterNodeData : public GameBaseData
ParticleEmitterNodeData();
~ParticleEmitterNodeData();
void packData(BitStream*);
void unpackData(BitStream*);
bool preload(bool server, String &errorStr);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr) override;
DECLARE_CONOBJECT(ParticleEmitterNodeData);
static void initPersistFields();
@ -78,10 +78,10 @@ class ParticleEmitterNode : public GameBase
ParticleEmitterNodeData* mDataBlock;
protected:
bool onAdd();
void onRemove();
bool onNewDataBlock( GameBaseData *dptr, bool reload );
void inspectPostApply();
bool onAdd() override;
void onRemove() override;
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
void inspectPostApply() override;
ParticleEmitterData* mEmitterDatablock;
S32 mEmitterDatablockId;
@ -99,15 +99,15 @@ class ParticleEmitterNode : public GameBase
// Time/Move Management
public:
void processTick(const Move* move);
void advanceTime(F32 dt);
void processTick(const Move* move) override;
void advanceTime(F32 dt) override;
DECLARE_CONOBJECT(ParticleEmitterNode);
DECLARE_CATEGORY("Environment \t FX");
static void initPersistFields();
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;
inline bool getActive( void ) { return mActive; };
inline void setActive( bool active ) { mActive = active; setMaskBits( StateMask ); };

26
Engine/source/T3D/fx/precipitation.h
View file

@ -64,10 +64,10 @@ class PrecipitationData : public GameBaseData
PrecipitationData();
DECLARE_CONOBJECT(PrecipitationData);
bool preload( bool server, String& errorStr );
bool preload( bool server, String& errorStr ) override;
static void initPersistFields();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
void onDropChanged() {}
void onSplashChanged() {}
@ -233,8 +233,8 @@ class Precipitation : public GameBase
} mTurbulenceData;
//other functions...
void processTick(const Move*);
void interpolateTick(F32 delta);
void processTick(const Move*) override;
void interpolateTick(F32 delta) override;
VectorF getWindVelocity();
void fillDropList(); ///< Adds/removes drops from the list to have the right # of drops
@ -253,20 +253,20 @@ class Precipitation : public GameBase
GFXPrimitiveBufferHandle mRainIB;
GFXVertexBufferHandle<GFXVertexPCT> mRainVB;
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
// Rendering
void prepRenderImage( SceneRenderState* state );
void prepRenderImage( SceneRenderState* state ) override;
void renderObject(ObjectRenderInst *ri, SceneRenderState *state, BaseMatInstance* );
void setTransform(const MatrixF &mat);
void setTransform(const MatrixF &mat) override;
public:
Precipitation();
~Precipitation();
void inspectPostApply();
void inspectPostApply() override;
enum
{
@ -278,13 +278,13 @@ class Precipitation : public GameBase
NextFreeMask = Parent::NextFreeMask << 5
};
bool onNewDataBlock( GameBaseData *dptr, bool reload );
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
DECLARE_CONOBJECT(Precipitation);
DECLARE_CATEGORY("Environment \t Weather");
static void initPersistFields();
U32 packUpdate(NetConnection*, U32 mask, BitStream* stream);
void unpackUpdate(NetConnection*, BitStream* stream);
U32 packUpdate(NetConnection*, U32 mask, BitStream* stream) override;
void unpackUpdate(NetConnection*, BitStream* stream) override;
void setPercentage(F32 pct);
void modifyStorm(F32 pct, U32 ms);

22
Engine/source/T3D/fx/ribbon.h
View file

@ -44,7 +44,7 @@ class RibbonData : public GameBaseData
typedef GameBaseData Parent;
protected:
bool onAdd();
bool onAdd() override;
public:
@ -70,9 +70,9 @@ public:
RibbonData();
void packData(BitStream*);
void unpackData(BitStream*);
bool preload(bool server, String &errorBuffer);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorBuffer) override;
static void initPersistFields();
DECLARE_CONOBJECT(RibbonData);
@ -104,13 +104,13 @@ class Ribbon : public GameBase
protected:
bool onAdd();
void processTick(const Move*);
void advanceTime(F32);
void interpolateTick(F32 delta);
bool onAdd() override;
void processTick(const Move*) override;
void advanceTime(F32) override;
void interpolateTick(F32 delta) override;
// Rendering
void prepRenderImage(SceneRenderState *state);
void prepRenderImage(SceneRenderState *state) override;
void setShaderParams();
///Checks to see if ribbon is too long
@ -126,8 +126,8 @@ public:
DECLARE_CONOBJECT(Ribbon);
DECLARE_CATEGORY("UNLISTED");
static void initPersistFields();
bool onNewDataBlock(GameBaseData*,bool);
void onRemove();
bool onNewDataBlock(GameBaseData*,bool) override;
void onRemove() override;
/// Used to add another segment to the ribbon.
void addSegmentPoint(Point3F &point, MatrixF &mat);

16
Engine/source/T3D/fx/ribbonNode.h
View file

@ -63,10 +63,10 @@ class RibbonNode : public GameBase
RibbonNodeData* mDataBlock;
protected:
bool onAdd();
void onRemove();
bool onNewDataBlock( GameBaseData *dptr, bool reload );
void inspectPostApply();
bool onAdd() override;
void onRemove() override;
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
void inspectPostApply() override;
RibbonData* mRibbonDatablock;
S32 mRibbonDatablockId;
@ -83,15 +83,15 @@ public:
// Time/Move Management
void processTick(const Move* move);
void advanceTime(F32 dt);
void processTick(const Move* move) override;
void advanceTime(F32 dt) override;
DECLARE_CONOBJECT(RibbonNode);
DECLARE_CATEGORY("Environment \t FX");
static void initPersistFields();
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;
inline bool getActive( void ) { return mActive; };
inline void setActive( bool active ) { mActive = active; setMaskBits( StateMask ); };

22
Engine/source/T3D/fx/splash.h
View file

@ -130,11 +130,11 @@ public:
SplashData();
DECLARE_CONOBJECT(SplashData);
bool onAdd();
bool preload(bool server, String &errorStr);
bool onAdd() override;
bool preload(bool server, String &errorStr) override;
static void initPersistFields();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
};
//--------------------------------------------------------------------------
@ -172,10 +172,10 @@ protected:
S32 mDelayMS;
protected:
bool onAdd();
void onRemove();
void processTick(const Move *move);
void advanceTime(F32 dt);
bool onAdd() override;
void onRemove() override;
void processTick(const Move *move) override;
void advanceTime(F32 dt) override;
void updateEmitters( F32 dt );
void updateWave( F32 dt );
void updateColor();
@ -190,10 +190,10 @@ public:
~Splash();
void setInitialState(const Point3F& point, const Point3F& normal, const F32 fade = 1.0);
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;
bool onNewDataBlock( GameBaseData *dptr, bool reload );
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
DECLARE_CONOBJECT(Splash);
DECLARE_CATEGORY("UNLISTED");
};