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

20
Engine/source/afx/ea/afxEA_AnimClip.cpp
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxEA_AnimClip();
/*C*/ ~afxEA_AnimClip();
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -176,13 +176,13 @@ class afxEA_AnimClipDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AnimClipDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_AnimClip; }
afxEffectWrapper* create() const override { return new afxEA_AnimClip; }
};
afxEA_AnimClipDesc afxEA_AnimClipDesc::desc;

16
Engine/source/afx/ea/afxEA_AnimLock.cpp
View file

@ -42,8 +42,8 @@ class afxEA_AnimLock : public afxEffectWrapper
public:
/*C*/ afxEA_AnimLock();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -84,13 +84,13 @@ class afxEA_AnimLockDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AnimLockDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_AnimLock; }
afxEffectWrapper* create() const override { return new afxEA_AnimLock; }
};
afxEA_AnimLockDesc afxEA_AnimLockDesc::desc;

20
Engine/source/afx/ea/afxEA_AreaDamage.cpp
View file

@ -53,12 +53,12 @@ public:
/*C*/ afxEA_AreaDamage();
/*C*/ ~afxEA_AreaDamage();
virtual bool isDone();
bool isDone() override;
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -246,12 +246,12 @@ class afxEA_AreaDamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_AreaDamageDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_AreaDamage; }
afxEffectWrapper* create() const override { return new afxEA_AreaDamage; }
};
afxEA_AreaDamageDesc afxEA_AreaDamageDesc::desc;

18
Engine/source/afx/ea/afxEA_AudioBank.cpp
View file

@ -53,10 +53,10 @@ public:
/*C*/ afxEA_AudioBank();
/*D*/ ~afxEA_AudioBank();
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -153,13 +153,13 @@ class afxEA_SoundBankDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_SoundBankDesc mDesc;
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 void prepEffect(afxEffectWrapperData*) const;
virtual afxEffectWrapper* create() const { return new afxEA_AudioBank; }
afxEffectWrapper* create() const override { return new afxEA_AudioBank; }
};
afxEA_SoundBankDesc afxEA_SoundBankDesc::mDesc;

26
Engine/source/afx/ea/afxEA_Billboard.cpp
View file

@ -47,14 +47,14 @@ public:
/*C*/ afxEA_Billboard();
/*D*/ ~afxEA_Billboard();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getUpdatedBoxCenter(Point3F& pos);
virtual void getBaseColor(LinearColorF& color) { if (bb_data) color = bb_data->color; }
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getUpdatedBoxCenter(Point3F& pos) override;
void getBaseColor(LinearColorF& color) override { if (bb_data) color = bb_data->color; }
};
@ -174,12 +174,12 @@ class afxEA_BillboardDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_BillboardDesc 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_Billboard; }
afxEffectWrapper* create() const override { return new afxEA_Billboard; }
};
//~~~~~~~~~~~~~~~~~~~~//

22
Engine/source/afx/ea/afxEA_CameraPuppet.cpp
View file

@ -50,13 +50,13 @@ class afxEA_CameraPuppet : public afxEffectWrapper
public:
/*C*/ afxEA_CameraPuppet();
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;
virtual void getUnconstrainedPosition(Point3F& pos);
virtual void getUnconstrainedTransform(MatrixF& xfm);
void getUnconstrainedPosition(Point3F& pos) override;
void getUnconstrainedTransform(MatrixF& xfm) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -164,12 +164,12 @@ class afxEA_CameraPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_CameraPuppetDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_CameraPuppet; }
afxEffectWrapper* create() const override { return new afxEA_CameraPuppet; }
};
afxEA_CameraPuppetDesc afxEA_CameraPuppetDesc::desc;

20
Engine/source/afx/ea/afxEA_CameraShake.cpp
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxEA_CameraShake();
/*D*/ ~afxEA_CameraShake();
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -172,13 +172,13 @@ class afxEA_CameraShakeDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_CameraShakeDesc 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; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
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; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_CameraShake; }
afxEffectWrapper* create() const override { return new afxEA_CameraShake; }
};
afxEA_CameraShakeDesc afxEA_CameraShakeDesc::desc;

24
Engine/source/afx/ea/afxEA_CollisionEvent.cpp
View file

@ -49,13 +49,13 @@ public:
/*C*/ afxEA_CollisionEvent();
/*D*/ ~afxEA_CollisionEvent();
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;
virtual void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel);
virtual void onDeleteNotify(SimObject*);
void collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel) override;
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -201,13 +201,13 @@ class afxEA_CollisionEventDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_CollisionEventDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_CollisionEvent; }
afxEffectWrapper* create() const override { return new afxEA_CollisionEvent; }
};
afxEA_CollisionEventDesc afxEA_CollisionEventDesc::desc;

20
Engine/source/afx/ea/afxEA_ConsoleMessage.cpp
View file

@ -45,11 +45,11 @@ class afxEA_ConsoleMessage : public afxEffectWrapper
public:
/*C*/ afxEA_ConsoleMessage();
virtual bool isDone() { return displayed; }
bool isDone() override { return displayed; }
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -109,13 +109,13 @@ class afxEA_ConsoleMessageDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_ConsoleMessageDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return true; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_ConsoleMessage; }
afxEffectWrapper* create() const override { return new afxEA_ConsoleMessage; }
};
afxEA_ConsoleMessageDesc afxEA_ConsoleMessageDesc::desc;

20
Engine/source/afx/ea/afxEA_Damage.cpp
View file

@ -51,12 +51,12 @@ public:
/*C*/ afxEA_Damage();
/*C*/ ~afxEA_Damage();
virtual bool isDone();
bool isDone() override;
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -183,12 +183,12 @@ class afxEA_DamageDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_DamageDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_Damage; }
afxEffectWrapper* create() const override { return new afxEA_Damage; }
};
afxEA_DamageDesc afxEA_DamageDesc::desc;

22
Engine/source/afx/ea/afxEA_Debris.cpp
View file

@ -50,14 +50,14 @@ public:
/*C*/ afxEA_Debris();
/*D*/ ~afxEA_Debris();
virtual bool isDone();
bool isDone() override;
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;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -176,12 +176,12 @@ class afxEA_DebrisDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_DebrisDesc 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_Debris; }
afxEffectWrapper* create() const override { return new afxEA_Debris; }
};
afxEA_DebrisDesc afxEA_DebrisDesc::desc;

20
Engine/source/afx/ea/afxEA_Explosion.cpp
View file

@ -48,12 +48,12 @@ class afxEA_Explosion : public afxEffectWrapper
public:
/*C*/ afxEA_Explosion();
virtual bool isDone() { return exploded; }
bool isDone() override { return exploded; }
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -127,12 +127,12 @@ class afxEA_ExplosionDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ExplosionDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
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 { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return false; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_Explosion; }
afxEffectWrapper* create() const override { return new afxEA_Explosion; }
};
afxEA_ExplosionDesc afxEA_ExplosionDesc::desc;

20
Engine/source/afx/ea/afxEA_FootSwitch.cpp
View file

@ -51,10 +51,10 @@ public:
void set_overrides(Player*);
void clear_overrides(Player*);
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;
};
@ -156,13 +156,13 @@ class afxEA_FootfallSwitchDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_FootfallSwitchDesc 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; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
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; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_FootSwitch; }
afxEffectWrapper* create() const override { return new afxEA_FootSwitch; }
};
afxEA_FootfallSwitchDesc afxEA_FootfallSwitchDesc::desc;

18
Engine/source/afx/ea/afxEA_GuiController.cpp
View file

@ -55,10 +55,10 @@ class afxEA_GuiController : public afxEffectWrapper
public:
/*C*/ afxEA_GuiController();
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -193,12 +193,12 @@ class afxEA_GuiControllerDesc : public afxEffectAdapterDesc, public afxEffectDef
static afxEA_GuiControllerDesc 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_GuiController; }
afxEffectWrapper* create() const override { return new afxEA_GuiController; }
};
afxEA_GuiControllerDesc afxEA_GuiControllerDesc::desc;

16
Engine/source/afx/ea/afxEA_GuiText.cpp
View file

@ -53,9 +53,9 @@ class afxEA_GuiText : public afxEffectWrapper
public:
/*C*/ afxEA_GuiText();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -157,12 +157,12 @@ class afxEA_GuiTextDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_GuiTextDesc 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_GuiText; }
afxEffectWrapper* create() const override { return new afxEA_GuiText; }
};
afxEA_GuiTextDesc afxEA_GuiTextDesc::desc;

10
Engine/source/afx/ea/afxEA_Light.cpp
View file

@ -39,12 +39,12 @@ class afxEA_LightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_LightDesc 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 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_LightDesc afxEA_LightDesc::desc;

18
Engine/source/afx/ea/afxEA_MachineGun.cpp
View file

@ -53,10 +53,10 @@ public:
/*C*/ afxEA_MachineGun();
/*D*/ ~afxEA_MachineGun();
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -184,12 +184,12 @@ class afxEA_MachineGunDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_MachineGunDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_MachineGun; }
afxEffectWrapper* create() const override { return new afxEA_MachineGun; }
};
afxEA_MachineGunDesc afxEA_MachineGunDesc::desc;

36
Engine/source/afx/ea/afxEA_Model.cpp
View file

@ -50,23 +50,23 @@ public:
/*C*/ afxEA_Model();
/*D*/ ~afxEA_Model();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos);
void getUpdatedBoxCenter(Point3F& pos) override;
virtual TSShape* getTSShape();
virtual TSShapeInstance* getTSShapeInstance();
virtual SceneObject* ea_get_scene_object() const;
TSShape* getTSShape() override;
TSShapeInstance* getTSShapeInstance() override;
SceneObject* ea_get_scene_object() const override;
virtual U32 ea_get_triggers() const;
virtual U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans);
virtual void resetAnimation(U32 tag);
virtual F32 getAnimClipDuration(const char* clip);
U32 setAnimClip(const char* clip, F32 pos, F32 rate, F32 trans) override;
void resetAnimation(U32 tag) override;
F32 getAnimClipDuration(const char* clip) override;
};
@ -230,12 +230,12 @@ class afxEA_ModelDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ModelDesc 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_Model; }
afxEffectWrapper* create() const override { return new afxEA_Model; }
};
//~~~~~~~~~~~~~~~~~~~~//

20
Engine/source/afx/ea/afxEA_Mooring.cpp
View file

@ -46,11 +46,11 @@ public:
/*C*/ afxEA_Mooring();
/*D*/ ~afxEA_Mooring();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -153,12 +153,12 @@ class afxEA_MooringDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_MooringDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_Mooring; }
afxEffectWrapper* create() const override { return new afxEA_Mooring; }
};
afxEA_MooringDesc afxEA_MooringDesc::desc;

10
Engine/source/afx/ea/afxEA_MultiLight.cpp
View file

@ -39,12 +39,12 @@ class afxEA_MultiLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_MultiLightDesc 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 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_MultiLightDesc afxEA_MultiLightDesc::desc;

10
Engine/source/afx/ea/afxEA_ParticleEmitter.cpp
View file

@ -299,12 +299,12 @@ class afxEA_ParticleEmitterDesc : public afxEffectAdapterDesc, public afxEffectD
static afxEA_ParticleEmitterDesc 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_ParticleEmitter; }
afxEffectWrapper* create() const override { return new afxEA_ParticleEmitter; }
};
afxEA_ParticleEmitterDesc afxEA_ParticleEmitterDesc::desc;

12
Engine/source/afx/ea/afxEA_ParticleEmitter.h
View file

@ -51,14 +51,14 @@ public:
/*C*/ afxEA_ParticleEmitter();
/*D*/ ~afxEA_ParticleEmitter();
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;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

20
Engine/source/afx/ea/afxEA_PhraseEffect.cpp
View file

@ -61,12 +61,12 @@ public:
/*C*/ afxEA_PhraseEffect();
/*D*/ ~afxEA_PhraseEffect();
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;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
};
//~~~~~~~~~~~~~~~~~~~~//
@ -360,12 +360,12 @@ class afxEA_PhraseEffectDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PhraseEffectDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
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 true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return true; }
virtual afxEffectWrapper* create() const { return new afxEA_PhraseEffect; }
afxEffectWrapper* create() const override { return new afxEA_PhraseEffect; }
};
afxEA_PhraseEffectDesc afxEA_PhraseEffectDesc::desc;

22
Engine/source/afx/ea/afxEA_PhysicalZone.cpp
View file

@ -51,12 +51,12 @@ public:
/*C*/ afxEA_PhysicalZone();
/*D*/ ~afxEA_PhysicalZone();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -203,12 +203,12 @@ class afxEA_PhysicalZoneDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PhysicalZoneDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_PhysicalZone; }
afxEffectWrapper* create() const override { return new afxEA_PhysicalZone; }
};
afxEA_PhysicalZoneDesc afxEA_PhysicalZoneDesc::desc;

18
Engine/source/afx/ea/afxEA_PlayerMovement.cpp
View file

@ -49,10 +49,10 @@ public:
/*C*/ afxEA_PlayerMovement();
/*C*/ ~afxEA_PlayerMovement();
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -147,12 +147,12 @@ class afxEA_PlayerMovementDesc : public afxEffectAdapterDesc, public afxEffectDe
static afxEA_PlayerMovementDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_PlayerMovement; }
afxEffectWrapper* create() const override { return new afxEA_PlayerMovement; }
};
afxEA_PlayerMovementDesc afxEA_PlayerMovementDesc::desc;

22
Engine/source/afx/ea/afxEA_PlayerPuppet.cpp
View file

@ -48,13 +48,13 @@ class afxEA_PlayerPuppet : public afxEffectWrapper
public:
/*C*/ afxEA_PlayerPuppet();
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;
virtual void getUnconstrainedPosition(Point3F& pos);
virtual void getUnconstrainedTransform(MatrixF& xfm);
void getUnconstrainedPosition(Point3F& pos) override;
void getUnconstrainedTransform(MatrixF& xfm) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -149,12 +149,12 @@ class afxEA_PlayerPuppetDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_PlayerPuppetDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_PlayerPuppet; }
afxEffectWrapper* create() const override { return new afxEA_PlayerPuppet; }
};
afxEA_PlayerPuppetDesc afxEA_PlayerPuppetDesc::desc;

28
Engine/source/afx/ea/afxEA_PointLight_T3D.cpp
View file

@ -51,15 +51,15 @@ public:
/*C*/ afxEA_T3DPointLight();
/*D*/ ~afxEA_T3DPointLight();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getBaseColor(LinearColorF& color);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getBaseColor(LinearColorF& color) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
};
//~~~~~~~~~~~~~~~~~~~~//
@ -123,7 +123,7 @@ public:
mLight->setColor(live_color);
}
void submitLights(LightManager* lm, bool staticLighting)
void submitLights(LightManager* lm, bool staticLighting) override
{
if (mAnimState.active && mAnimationData && mFade_amt < 1.0f)
{
@ -265,12 +265,12 @@ class afxEA_T3DPointLightDesc : public afxEffectAdapterDesc, public afxEffectDef
static afxEA_T3DPointLightDesc 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_T3DPointLight; }
afxEffectWrapper* create() const override { return new afxEA_T3DPointLight; }
};
afxEA_T3DPointLightDesc afxEA_T3DPointLightDesc::desc;

22
Engine/source/afx/ea/afxEA_Projectile.cpp
View file

@ -56,14 +56,14 @@ public:
/*C*/ afxEA_Projectile();
/*D*/ ~afxEA_Projectile();
virtual bool isDone();
bool isDone() override;
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;
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -268,12 +268,12 @@ class afxEA_ProjectileDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ProjectileDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const;
virtual bool runsOnClient(const afxEffectWrapperData*) const;
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override;
bool runsOnClient(const afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_Projectile; }
afxEffectWrapper* create() const override { return new afxEA_Projectile; }
};
afxEA_ProjectileDesc afxEA_ProjectileDesc::desc;

22
Engine/source/afx/ea/afxEA_ScriptEvent.cpp
View file

@ -46,12 +46,12 @@ public:
/*C*/ afxEA_ScriptEvent();
/*D*/ ~afxEA_ScriptEvent();
virtual bool isDone() { return ran_script; }
bool isDone() override { return ran_script; }
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;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -126,13 +126,13 @@ class afxEA_ScriptEventDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ScriptEventDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const { return false; }
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
virtual bool isPositional(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override { return false; }
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
bool isPositional(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_ScriptEvent; }
afxEffectWrapper* create() const override { return new afxEA_ScriptEvent; }
};
afxEA_ScriptEventDesc afxEA_ScriptEventDesc::desc;

24
Engine/source/afx/ea/afxEA_Sound.cpp
View file

@ -51,14 +51,14 @@ public:
/*C*/ afxEA_Sound();
/*D*/ ~afxEA_Sound();
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;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
virtual void onDeleteNotify(SimObject*);
void onDeleteNotify(SimObject*) override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -153,13 +153,13 @@ class afxEA_SoundDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_SoundDesc mDesc;
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; }
virtual void prepEffect(afxEffectWrapperData*) const;
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; }
void prepEffect(afxEffectWrapperData*) const override;
virtual afxEffectWrapper* create() const { return new afxEA_Sound; }
afxEffectWrapper* create() const override { return new afxEA_Sound; }
};
afxEA_SoundDesc afxEA_SoundDesc::mDesc;

28
Engine/source/afx/ea/afxEA_SpotLight_T3D.cpp
View file

@ -51,15 +51,15 @@ public:
/*C*/ afxEA_T3DSpotLight();
/*D*/ ~afxEA_T3DSpotLight();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getBaseColor(LinearColorF& color);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getBaseColor(LinearColorF& color) override;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
};
//~~~~~~~~~~~~~~~~~~~~//
@ -128,7 +128,7 @@ public:
mLight->setColor(live_color);
}
void submitLights(LightManager* lm, bool staticLighting)
void submitLights(LightManager* lm, bool staticLighting) override
{
if (mAnimState.active && mAnimationData && mFade_amt < 1.0f)
{
@ -269,12 +269,12 @@ class afxEA_T3DSpotLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_T3DSpotLightDesc 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_T3DSpotLight; }
afxEffectWrapper* create() const override { return new afxEA_T3DSpotLight; }
};
afxEA_T3DSpotLightDesc afxEA_T3DSpotLightDesc::desc;

28
Engine/source/afx/ea/afxEA_StaticShape.cpp
View file

@ -48,16 +48,16 @@ public:
/*C*/ afxEA_StaticShape();
/*D*/ ~afxEA_StaticShape();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
virtual void getUpdatedBoxCenter(Point3F& pos);
virtual TSShape* getTSShape();
virtual TSShapeInstance* getTSShapeInstance();
void getUpdatedBoxCenter(Point3F& pos) override;
TSShape* getTSShape() override;
TSShapeInstance* getTSShapeInstance() override;
};
//~~~~~~~~~~~~~~~~~~~~//
@ -222,12 +222,12 @@ class afxEA_StaticShapeDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_StaticShapeDesc desc;
public:
virtual bool testEffectType(const SimDataBlock*) const;
virtual bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const;
virtual bool runsOnServer(const afxEffectWrapperData*) const { return true; }
virtual bool runsOnClient(const afxEffectWrapperData*) const { return false; }
bool testEffectType(const SimDataBlock*) const override;
bool requiresStop(const afxEffectWrapperData*, const afxEffectTimingData&) const override;
bool runsOnServer(const afxEffectWrapperData*) const override { return true; }
bool runsOnClient(const afxEffectWrapperData*) const override { return false; }
virtual afxEffectWrapper* create() const { return new afxEA_StaticShape; }
afxEffectWrapper* create() const override { return new afxEA_StaticShape; }
};
afxEA_StaticShapeDesc afxEA_StaticShapeDesc::desc;

10
Engine/source/afx/ea/afxEA_TLKLight.cpp
View file

@ -53,12 +53,12 @@ class afxEA_TLKLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_TLKLightDesc 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 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_TLKLightDesc afxEA_TLKLightDesc::desc;

10
Engine/source/afx/ea/afxEA_VolumeLight.cpp
View file

@ -38,12 +38,12 @@ class afxEA_VolumeLightDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_VolumeLightDesc 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 0; }
afxEffectWrapper* create() const override { return 0; }
};
afxEA_VolumeLightDesc afxEA_VolumeLightDesc::desc;

22
Engine/source/afx/ea/afxEA_Zodiac.cpp
View file

@ -65,14 +65,14 @@ public:
/*C*/ afxEA_Zodiac();
/*C*/ ~afxEA_Zodiac();
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;
virtual bool ea_is_enabled() { return true; }
bool ea_is_enabled() override { return true; }
virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; }
void getBaseColor(LinearColorF& color) override { color = zode_data->color; }
static void initPersistFields();
@ -412,12 +412,12 @@ class afxEA_ZodiacDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ZodiacDesc 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_Zodiac; }
afxEffectWrapper* create() const override { return new afxEA_Zodiac; }
};
afxEA_ZodiacDesc afxEA_ZodiacDesc::desc;

26
Engine/source/afx/ea/afxEA_ZodiacPlane.cpp
View file

@ -58,14 +58,14 @@ public:
/*C*/ afxEA_ZodiacPlane();
/*D*/ ~afxEA_ZodiacPlane();
virtual void ea_set_datablock(SimDataBlock*);
virtual bool ea_start();
virtual bool ea_update(F32 dt);
virtual void ea_finish(bool was_stopped);
virtual void ea_set_scope_status(bool flag);
virtual void onDeleteNotify(SimObject*);
virtual void getUpdatedBoxCenter(Point3F& pos);
virtual void getBaseColor(LinearColorF& color) { color = zode_data->color; }
void ea_set_datablock(SimDataBlock*) override;
bool ea_start() override;
bool ea_update(F32 dt) override;
void ea_finish(bool was_stopped) override;
void ea_set_scope_status(bool flag) override;
void onDeleteNotify(SimObject*) override;
void getUpdatedBoxCenter(Point3F& pos) override;
void getBaseColor(LinearColorF& color) override { color = zode_data->color; }
};
F32 afxEA_ZodiacPlane::calc_facing_angle()
@ -319,12 +319,12 @@ class afxEA_ZodiacPlaneDesc : public afxEffectAdapterDesc, public afxEffectDefs
static afxEA_ZodiacPlaneDesc 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_ZodiacPlane; }
afxEffectWrapper* create() const override { return new afxEA_ZodiacPlane; }
};
//~~~~~~~~~~~~~~~~~~~~//