mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 23:24:41 +00:00
rest of virtuals removed
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:
parent
efbe5e90f5
commit
2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
|
|
@ -47,10 +47,10 @@ public:
|
|||
/*C*/ afxEA_Force();
|
||||
/*D*/ ~afxEA_Force();
|
||||
|
||||
virtual void ea_set_datablock(SimDataBlock*);
|
||||
virtual bool ea_start();
|
||||
virtual bool ea_update(F32 dt);
|
||||
virtual void ea_finish(bool was_stopped);
|
||||
void ea_set_datablock(SimDataBlock*) override;
|
||||
bool ea_start() override;
|
||||
bool ea_update(F32 dt) override;
|
||||
void ea_finish(bool was_stopped) override;
|
||||
};
|
||||
|
||||
//~~~~~~~~~~~~~~~~~~~~//
|
||||
|
|
@ -155,12 +155,12 @@ class afxEA_ForceDesc : public afxEffectAdapterDesc, public afxEffectDefs
|
|||
static afxEA_ForceDesc desc;
|
||||
|
||||
public:
|
||||
virtual bool testEffectType(const SimDataBlock*) const;
|
||||
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
|
||||
virtual bool runsOnServer(const afxEffectWrapperData*) const { return false; }
|
||||
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
|
||||
bool testEffectType(const SimDataBlock*) const override;
|
||||
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
|
||||
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
|
||||
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
|
||||
|
||||
virtual afxEffectWrapper* create() const { return new afxEA_Force; }
|
||||
afxEffectWrapper* create() const override { return new afxEA_Force; }
|
||||
};
|
||||
|
||||
afxEA_ForceDesc afxEA_ForceDesc::desc;
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ public:
|
|||
/*C*/ afxF_DragData();
|
||||
/*C*/ afxF_DragData(const afxF_DragData&, bool = false);
|
||||
|
||||
virtual void packData(BitStream* stream);
|
||||
virtual void unpackData(BitStream* stream);
|
||||
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
|
||||
void packData(BitStream* stream) override;
|
||||
void unpackData(BitStream* stream) override;
|
||||
afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
@ -65,10 +65,10 @@ private:
|
|||
public:
|
||||
/*C*/ afxF_Drag();
|
||||
|
||||
virtual bool onNewDataBlock(afxForceData* dptr, bool reload);
|
||||
bool onNewDataBlock(afxForceData* dptr, bool reload) override;
|
||||
|
||||
virtual void start();
|
||||
virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass);
|
||||
void start() override;
|
||||
Point3F evaluate(Point3F pos, Point3F v, F32 mass) override;
|
||||
};
|
||||
|
||||
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
|
||||
|
|
@ -196,8 +196,8 @@ class afxF_DragDesc : public afxForceDesc
|
|||
static afxF_DragDesc desc;
|
||||
|
||||
public:
|
||||
virtual bool testForceType(const SimDataBlock*) const;
|
||||
virtual afxForce* create() const { return new afxF_Drag; }
|
||||
bool testForceType(const SimDataBlock*) const override;
|
||||
afxForce* create() const override { return new afxF_Drag; }
|
||||
};
|
||||
|
||||
afxF_DragDesc afxF_DragDesc::desc;
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ public:
|
|||
/*C*/ afxF_GravityData();
|
||||
/*C*/ afxF_GravityData(const afxF_GravityData&, bool = false);
|
||||
|
||||
virtual void packData(BitStream* stream);
|
||||
virtual void unpackData(BitStream* stream);
|
||||
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0);
|
||||
void packData(BitStream* stream) override;
|
||||
void unpackData(BitStream* stream) override;
|
||||
afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0) override;
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
|
|
@ -62,9 +62,9 @@ private:
|
|||
public:
|
||||
/*C*/ afxF_Gravity();
|
||||
|
||||
virtual bool onNewDataBlock(afxForceData* dptr, bool reload);
|
||||
bool onNewDataBlock(afxForceData* dptr, bool reload) override;
|
||||
|
||||
virtual Point3F evaluate(Point3F pos, Point3F v, F32 mass);
|
||||
Point3F evaluate(Point3F pos, Point3F v, F32 mass) override;
|
||||
};
|
||||
|
||||
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
|
||||
|
|
@ -158,8 +158,8 @@ class afxF_GravityDesc : public afxForceDesc
|
|||
static afxF_GravityDesc desc;
|
||||
|
||||
public:
|
||||
virtual bool testForceType(const SimDataBlock*) const;
|
||||
virtual afxForce* create() const { return new afxF_Gravity; }
|
||||
bool testForceType(const SimDataBlock*) const override;
|
||||
afxForce* create() const override { return new afxF_Gravity; }
|
||||
};
|
||||
|
||||
afxF_GravityDesc afxF_GravityDesc::desc;
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ public:
|
|||
/*C*/ afxForceData();
|
||||
/*C*/ afxForceData(const afxForceData&, bool = false);
|
||||
|
||||
virtual bool onAdd();
|
||||
virtual void packData(BitStream* stream);
|
||||
virtual void unpackData(BitStream* stream);
|
||||
bool onAdd() override;
|
||||
void packData(BitStream* stream) override;
|
||||
void unpackData(BitStream* stream) override;
|
||||
|
||||
virtual bool allowSubstitutions() const { return true; }
|
||||
bool allowSubstitutions() const override { return true; }
|
||||
virtual afxForceData* cloneAndPerformSubstitutions(const SimObject*, S32 index=0)=0;
|
||||
|
||||
static void initPersistFields();
|
||||
|
|
|
|||
|
|
@ -52,16 +52,16 @@ public:
|
|||
/*C*/ afxXM_ForceData();
|
||||
/*C*/ afxXM_ForceData(const afxXM_ForceData&, bool = false);
|
||||
|
||||
void packData(BitStream* stream);
|
||||
void unpackData(BitStream* stream);
|
||||
void packData(BitStream* stream) override;
|
||||
void unpackData(BitStream* stream) override;
|
||||
|
||||
bool preload(bool server, String &errorStr);
|
||||
bool preload(bool server, String &errorStr) override;
|
||||
|
||||
virtual bool allowSubstitutions() const { return true; }
|
||||
bool allowSubstitutions() const override { return true; }
|
||||
|
||||
static void initPersistFields();
|
||||
|
||||
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
|
||||
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
|
||||
|
||||
DECLARE_CONOBJECT(afxXM_ForceData);
|
||||
};
|
||||
|
|
@ -85,8 +85,8 @@ class afxXM_Force : public afxXM_WeightedBase, public afxEffectDefs
|
|||
public:
|
||||
/*C*/ afxXM_Force(afxXM_ForceData*, afxEffectWrapper*);
|
||||
|
||||
virtual void start(F32 timestamp);
|
||||
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
|
||||
void start(F32 timestamp) override;
|
||||
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
|
||||
};
|
||||
|
||||
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue