TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 08:15:44 +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

16
Engine/source/afx/xm/afxXM_Aim.cpp
View file

@ -44,14 +44,14 @@ public:
/*C*/ afxXM_AimData();
/*C*/ afxXM_AimData(const afxXM_AimData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_AimData);
};
@ -67,7 +67,7 @@ class afxXM_Aim_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_Aim_weighted(afxXM_AimData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -79,7 +79,7 @@ class afxXM_Aim_weighted_z : public afxXM_WeightedBase
public:
/*C*/ afxXM_Aim_weighted_z(afxXM_AimData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -91,7 +91,7 @@ class afxXM_Aim_fixed : public afxXM_Base
public:
/*C*/ afxXM_Aim_fixed(afxXM_AimData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -103,7 +103,7 @@ class afxXM_Aim_fixed_z : public afxXM_Base
public:
/*C*/ afxXM_Aim_fixed_z(afxXM_AimData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

8
Engine/source/afx/xm/afxXM_AltitudeConform.cpp
View file

@ -46,11 +46,11 @@ public:
/*C*/ afxXM_AltitudeConformData();
/*C*/ afxXM_AltitudeConformData(const afxXM_AltitudeConformData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
DECLARE_CONOBJECT(afxXM_AltitudeConformData);
};
@ -70,7 +70,7 @@ class afxXM_AltitudeConform : public afxXM_WeightedBase
public:
/*C*/ afxXM_AltitudeConform(afxXM_AltitudeConformData*, afxEffectWrapper*, bool on_server);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

8
Engine/source/afx/xm/afxXM_BoxAdapt.cpp
View file

@ -45,11 +45,11 @@ public:
/*C*/ afxXM_BoxAdaptData();
/*C*/ afxXM_BoxAdaptData(const afxXM_BoxAdaptData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
DECLARE_CONOBJECT(afxXM_BoxAdaptData);
};
@ -68,7 +68,7 @@ class afxXM_BoxAdapt : public afxXM_WeightedBase
public:
/*C*/ afxXM_BoxAdapt(afxXM_BoxAdaptData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

8
Engine/source/afx/xm/afxXM_BoxConform.cpp
View file

@ -46,11 +46,11 @@ public:
/*C*/ afxXM_BoxConformData();
/*C*/ afxXM_BoxConformData(const afxXM_BoxConformData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
DECLARE_CONOBJECT(afxXM_BoxConformData);
};
@ -64,7 +64,7 @@ class afxXM_BoxConform : public afxXM_Base
public:
/*C*/ afxXM_BoxConform(afxXM_BoxConformData*, afxEffectWrapper*, bool on_server);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

8
Engine/source/afx/xm/afxXM_BoxHeightOffset.cpp
View file

@ -44,12 +44,12 @@ public:
/*C*/ afxXM_BoxHeightOffsetData();
/*C*/ afxXM_BoxHeightOffsetData(const afxXM_BoxHeightOffsetData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
#if defined(AFX_VERSION)
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
#else
afxXM_Base* create(afxEffectWrapper* fx);
#endif
@ -67,7 +67,7 @@ class afxXM_BoxHeightOffset : public afxXM_Base
public:
/*C*/ afxXM_BoxHeightOffset(afxXM_BoxHeightOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

18
Engine/source/afx/xm/afxXM_Freeze.cpp
View file

@ -43,14 +43,14 @@ public:
/*C*/ afxXM_FreezeData() : mask(POSITION | ORIENTATION | POSITION2), delay(0.0f) { }
/*C*/ afxXM_FreezeData(const afxXM_FreezeData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_FreezeData);
};
@ -71,7 +71,7 @@ class afxXM_Freeze : public afxXM_Base
public:
/*C*/ afxXM_Freeze(afxXM_FreezeData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -89,7 +89,7 @@ class afxXM_Freeze_all_but_scale : public afxXM_Base
public:
/*C*/ afxXM_Freeze_all_but_scale(afxXM_FreezeData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -105,7 +105,7 @@ class afxXM_Freeze_pos : public afxXM_Base
public:
/*C*/ afxXM_Freeze_pos(afxXM_FreezeData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -121,7 +121,7 @@ class afxXM_Freeze_pos2 : public afxXM_Base
public:
/*C*/ afxXM_Freeze_pos2(afxXM_FreezeData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -137,7 +137,7 @@ class afxXM_Freeze_ori : public afxXM_Base
public:
/*C*/ afxXM_Freeze_ori(afxXM_FreezeData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

10
Engine/source/afx/xm/afxXM_GroundConform.cpp
View file

@ -45,14 +45,14 @@ public:
/*C*/ afxXM_GroundConformData();
/*C*/ afxXM_GroundConformData(const afxXM_GroundConformData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_GroundConformData);
};
@ -67,7 +67,7 @@ class afxXM_GroundConform : public afxXM_WeightedBase
public:
/*C*/ afxXM_GroundConform(afxXM_GroundConformData*, afxEffectWrapper*, bool on_server);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

10
Engine/source/afx/xm/afxXM_HeightSampler.cpp
View file

@ -42,14 +42,14 @@ public:
/*C*/ afxXM_HeightSamplerData();
/*C*/ afxXM_HeightSamplerData(const afxXM_HeightSamplerData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_HeightSamplerData);
};
@ -65,7 +65,7 @@ class afxXM_HeightSampler : public afxXM_WeightedBase
public:
/*C*/ afxXM_HeightSampler(afxXM_HeightSamplerData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

14
Engine/source/afx/xm/afxXM_MountedImageNode.cpp
View file

@ -43,15 +43,15 @@ public:
/*C*/ afxXM_MountedImageNodeData();
/*C*/ afxXM_MountedImageNodeData(const afxXM_MountedImageNodeData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() 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_MountedImageNodeData);
};
@ -73,8 +73,8 @@ class afxXM_MountedImageNode : public afxXM_Base
public:
/*C*/ afxXM_MountedImageNode(afxXM_MountedImageNodeData*, 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;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//

32
Engine/source/afx/xm/afxXM_Offset.cpp
View file

@ -49,14 +49,14 @@ public:
/*C*/ afxXM_LocalOffsetData();
/*C*/ afxXM_LocalOffsetData(const afxXM_LocalOffsetData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_LocalOffsetData);
};
@ -71,7 +71,7 @@ class afxXM_LocalOffset_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_LocalOffset_weighted(afxXM_LocalOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -87,7 +87,7 @@ class afxXM_LocalOffset_fixed : public afxXM_Base
public:
/*C*/ afxXM_LocalOffset_fixed(afxXM_LocalOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -100,7 +100,7 @@ class afxXM_LocalOffset2_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_LocalOffset2_weighted(afxXM_LocalOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -116,7 +116,7 @@ class afxXM_LocalOffset2_fixed : public afxXM_Base
public:
/*C*/ afxXM_LocalOffset2_fixed(afxXM_LocalOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -134,14 +134,14 @@ public:
/*C*/ afxXM_WorldOffsetData();
/*C*/ afxXM_WorldOffsetData(const afxXM_WorldOffsetData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_WorldOffsetData);
};
@ -156,7 +156,7 @@ class afxXM_WorldOffset_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_WorldOffset_weighted(afxXM_WorldOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -171,7 +171,7 @@ class afxXM_WorldOffset_fixed : public afxXM_Base
public:
/*C*/ afxXM_WorldOffset_fixed(afxXM_WorldOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -184,7 +184,7 @@ class afxXM_WorldOffset2_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_WorldOffset2_weighted(afxXM_WorldOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -199,7 +199,7 @@ class afxXM_WorldOffset2_fixed : public afxXM_Base
public:
/*C*/ afxXM_WorldOffset2_fixed(afxXM_WorldOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

18
Engine/source/afx/xm/afxXM_Oscillate.cpp
View file

@ -51,14 +51,14 @@ public:
/*C*/ afxXM_OscillateData();
/*C*/ afxXM_OscillateData(const afxXM_OscillateData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_OscillateData);
};
@ -72,7 +72,7 @@ class afxXM_Oscillate_rot : public afxXM_WeightedBase
public:
/*C*/ afxXM_Oscillate_rot(afxXM_OscillateData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
class afxXM_Oscillate_scale : public afxXM_WeightedBase
@ -84,7 +84,7 @@ class afxXM_Oscillate_scale : public afxXM_WeightedBase
public:
/*C*/ afxXM_Oscillate_scale(afxXM_OscillateData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
class afxXM_Oscillate_position : public afxXM_WeightedBase
@ -96,7 +96,7 @@ class afxXM_Oscillate_position : public afxXM_WeightedBase
public:
/*C*/ afxXM_Oscillate_position(afxXM_OscillateData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
class afxXM_Oscillate_position2 : public afxXM_WeightedBase
@ -108,7 +108,7 @@ class afxXM_Oscillate_position2 : public afxXM_WeightedBase
public:
/*C*/ afxXM_Oscillate_position2(afxXM_OscillateData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
class afxXM_Oscillate : public afxXM_WeightedBase
@ -120,7 +120,7 @@ class afxXM_Oscillate : public afxXM_WeightedBase
public:
/*C*/ afxXM_Oscillate(afxXM_OscillateData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

10
Engine/source/afx/xm/afxXM_OscillateZodiacColor.cpp
View file

@ -41,11 +41,11 @@ public:
public:
/*C*/ afxXM_OscillateZodiacColorData();
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
afxXM_Base* create(afxEffectWrapper* fx, bool on_server);
afxXM_Base* create(afxEffectWrapper* fx, bool on_server) override;
DECLARE_CONOBJECT(afxXM_OscillateZodiacColorData);
};
@ -64,8 +64,8 @@ class afxXM_OscillateZodiacColor : public afxXM_WeightedBase
public:
/*C*/ afxXM_OscillateZodiacColor(afxXM_OscillateZodiacColorData*, afxEffectWrapper*);
virtual void update(F32 dt, F32 elapsed, Point3F& pos, MatrixF& ori, Point3F& pos2,
Point3F& scale);
void update(F32 dt, F32 elapsed, Point3F& pos, MatrixF& ori, Point3F& pos2,
Point3F& scale) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

16
Engine/source/afx/xm/afxXM_PathConform.cpp
View file

@ -55,16 +55,16 @@ public:
/*C*/ afxXM_PathConformData();
/*C*/ afxXM_PathConformData(const afxXM_PathConformData&, bool = false);
bool onAdd();
bool preload(bool server, String &errorStr);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd() override;
bool preload(bool server, String &errorStr) override;
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_PathConformData);
};
@ -89,8 +89,8 @@ public:
/*C*/ afxXM_PathConform(afxXM_PathConformData*, afxEffectWrapper*);
/*D*/ ~afxXM_PathConform();
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;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

10
Engine/source/afx/xm/afxXM_PivotNodeOffset.cpp
View file

@ -45,14 +45,14 @@ public:
/*C*/ afxXM_PivotNodeOffsetData();
/*C*/ afxXM_PivotNodeOffsetData(const afxXM_PivotNodeOffsetData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_PivotNodeOffsetData);
};
@ -72,7 +72,7 @@ class afxXM_PivotNodeOffset : public afxXM_Base
public:
/*C*/ afxXM_PivotNodeOffset(afxXM_PivotNodeOffsetData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//

12
Engine/source/afx/xm/afxXM_RandomRot.cpp
View file

@ -49,15 +49,15 @@ public:
/*C*/ afxXM_RandomRotData();
/*C*/ afxXM_RandomRotData(const afxXM_RandomRotData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() 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_RandomRotData);
};
@ -71,7 +71,7 @@ class afxXM_RandomRot : public afxXM_Base
public:
/*C*/ afxXM_RandomRot(afxXM_RandomRotData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

10
Engine/source/afx/xm/afxXM_Scale.cpp
View file

@ -47,14 +47,14 @@ public:
/*C*/ afxXM_ScaleData();
/*C*/ afxXM_ScaleData(const afxXM_ScaleData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_ScaleData);
};
@ -70,7 +70,7 @@ class afxXM_Scale_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_Scale_weighted(afxXM_ScaleData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

10
Engine/source/afx/xm/afxXM_Shockwave.cpp
View file

@ -48,14 +48,14 @@ public:
/*C*/ afxXM_ShockwaveData();
/*C*/ afxXM_ShockwaveData(const afxXM_ShockwaveData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_ShockwaveData);
};
@ -73,7 +73,7 @@ class afxXM_Shockwave : public afxXM_Base
public:
/*C*/ afxXM_Shockwave(afxXM_ShockwaveData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

14
Engine/source/afx/xm/afxXM_Spin.cpp
View file

@ -51,15 +51,15 @@ public:
/*C*/ afxXM_SpinData() : spin_axis(0,0,1), spin_angle(0), spin_angle_var(0), spin_rate(0), spin_rate_var(0) { }
/*C*/ afxXM_SpinData(const afxXM_SpinData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool onAdd();
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
bool onAdd() 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_SpinData);
};
@ -77,7 +77,7 @@ class afxXM_Spin_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_Spin_weighted(afxXM_SpinData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -93,7 +93,7 @@ class afxXM_Spin_fixed : public afxXM_Base
public:
/*C*/ afxXM_Spin_fixed(afxXM_SpinData*, afxEffectWrapper*);
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

24
Engine/source/afx/xm/afxXM_VelocityOffset.cpp
View file

@ -50,14 +50,14 @@ public:
/*C*/ afxXM_VelocityOffsetData();
/*C*/ afxXM_VelocityOffsetData(const afxXM_VelocityOffsetData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_VelocityOffsetData);
};
@ -75,8 +75,8 @@ class afxXM_VelocityOffset_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_VelocityOffset_weighted(afxXM_VelocityOffsetData*, 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;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -95,8 +95,8 @@ class afxXM_VelocityOffset_fixed : public afxXM_Base
public:
/*C*/ afxXM_VelocityOffset_fixed(afxXM_VelocityOffsetData*, 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;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -112,8 +112,8 @@ class afxXM_VelocityOffset2_weighted : public afxXM_WeightedBase
public:
/*C*/ afxXM_VelocityOffset2_weighted(afxXM_VelocityOffsetData*, 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;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//
@ -132,8 +132,8 @@ class afxXM_VelocityOffset2_fixed : public afxXM_Base
public:
/*C*/ afxXM_VelocityOffset2_fixed(afxXM_VelocityOffsetData*, 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;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

24
Engine/source/afx/xm/afxXM_WaveBase.h
View file

@ -42,37 +42,37 @@ public:
class afxXM_WaveformSine : public afxXM_Waveform
{
public:
virtual F32 evaluate(F32 t);
F32 evaluate(F32 t) override;
};
class afxXM_WaveformSquare : public afxXM_Waveform
{
public:
virtual F32 evaluate(F32 t);
F32 evaluate(F32 t) override;
};
class afxXM_WaveformTriangle : public afxXM_Waveform
{
public:
virtual F32 evaluate(F32 t);
F32 evaluate(F32 t) override;
};
class afxXM_WaveformSawtooth : public afxXM_Waveform
{
public:
virtual F32 evaluate(F32 t) { return t; }
F32 evaluate(F32 t) override { return t; }
};
class afxXM_WaveformNoise : public afxXM_Waveform
{
public:
virtual F32 evaluate(F32 t) { return gRandGen.randF(); };
F32 evaluate(F32 t) override { return gRandGen.randF(); };
};
class afxXM_WaveformOne : public afxXM_Waveform
{
public:
virtual F32 evaluate(F32 t) { return 1.0f; };
F32 evaluate(F32 t) override { return 1.0f; };
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@ -163,8 +163,8 @@ public:
/*C*/ afxXM_WaveBaseData();
/*C*/ afxXM_WaveBaseData(const afxXM_WaveBaseData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
@ -203,8 +203,8 @@ public:
/*C*/ afxXM_WaveRiderBaseData();
/*C*/ afxXM_WaveRiderBaseData(const afxXM_WaveRiderBaseData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
@ -249,7 +249,7 @@ public:
/*C*/ afxXM_WaveBase(afxXM_WaveBaseData*, afxEffectWrapper*, afxXM_WaveInterp*);
/*D*/ virtual ~afxXM_WaveBase();
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
inline F32 afxXM_WaveBase::calc_initial_speed()
@ -302,7 +302,7 @@ public:
/*C*/ afxXM_WaveRiderBase(afxXM_WaveRiderBaseData*, afxEffectWrapper*, afxXM_WaveInterp*);
/*D*/ ~afxXM_WaveRiderBase();
virtual void updateParams(F32 dt, F32 elapsed, afxXM_Params& params);
void updateParams(F32 dt, F32 elapsed, afxXM_Params& params) override;
};
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

26
Engine/source/afx/xm/afxXM_WaveColor.cpp
View file

@ -45,8 +45,8 @@ public:
void set(LinearColorF& a, LinearColorF& b, LinearColorF& a_var, LinearColorF& b_var, bool sync_var);
virtual void interpolate(F32 t, afxXM_Params& params)=0;
virtual void pulse();
void interpolate(F32 t, afxXM_Params& params) override =0;
void pulse() override;
};
afxXM_WaveInterp_Color::afxXM_WaveInterp_Color()
@ -88,7 +88,7 @@ inline void afxXM_WaveInterp_Color::pulse()
class afxXM_WaveInterp_Color_Add : public afxXM_WaveInterp_Color
{
public:
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
LinearColorF temp_color;
temp_color.interpolate(mA, mB, t);
@ -101,7 +101,7 @@ public:
class afxXM_WaveInterp_Color_Mul : public afxXM_WaveInterp_Color
{
public:
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
LinearColorF temp_color;
temp_color.interpolate(mA, mB, t);
@ -114,7 +114,7 @@ public:
class afxXM_WaveInterp_Color_Rep : public afxXM_WaveInterp_Color
{
public:
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
params.color.interpolate(mA, mB, t);
}
@ -171,14 +171,14 @@ public:
/*C*/ afxXM_WaveColorData();
/*C*/ afxXM_WaveColorData(const afxXM_WaveColorData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_WaveColorData);
};
@ -286,14 +286,14 @@ public:
/*C*/ afxXM_WaveRiderColorData();
/*C*/ afxXM_WaveRiderColorData(const afxXM_WaveRiderColorData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_WaveRiderColorData);
};

54
Engine/source/afx/xm/afxXM_WaveScalar.cpp
View file

@ -45,8 +45,8 @@ public:
void set(F32 a, F32 b, F32 a_var, F32 b_var, bool sync_var);
virtual void interpolate(F32 t, afxXM_Params& params)=0;
virtual void pulse();
void interpolate(F32 t, afxXM_Params& params) override =0;
void pulse() override;
};
afxXM_WaveInterp_Scalar::afxXM_WaveInterp_Scalar()
@ -88,7 +88,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_Add(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
*((F32*)(((char*)(&params)) + offset)) += mLerp(mA, mB,t);
}
@ -102,7 +102,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_Mul(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
*((F32*)(((char*)(&params)) + offset)) *= mLerp(mA, mB,t);
}
@ -116,7 +116,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_Rep(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
*((F32*)(((char*)(&params)) + offset)) = mLerp(mA, mB,t);
}
@ -130,7 +130,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_PointAdd(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
F32 scalar_at_t = mLerp(mA, mB,t);
Point3F point_at_t(scalar_at_t, scalar_at_t, scalar_at_t);
@ -146,7 +146,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_PointMul(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
*((Point3F*)(((char*)(&params)) + offset)) *= mLerp(mA, mB,t);
}
@ -160,7 +160,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_PointRep(U32 o) : afxXM_WaveInterp_Scalar() { offset = o; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
F32 scalar_at_t = mLerp(mA, mB,t);
Point3F point_at_t(scalar_at_t, scalar_at_t, scalar_at_t);
@ -177,7 +177,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_Axis_PointAdd(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
Point3F point_at_t = axis* mLerp(mA, mB,t);
*((Point3F*)(((char*)(&params)) + offset)) += point_at_t;
@ -191,7 +191,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_LocalAxis_PointAdd(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
Point3F local_axis(axis);
params.ori.mulV(local_axis);
@ -209,7 +209,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_Axis_PointMul(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
Point3F point_at_t = axis* mLerp(mA, mB,t);
*((Point3F*)(((char*)(&params)) + offset)) *= point_at_t;
@ -223,7 +223,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_LocalAxis_PointMul(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
Point3F local_axis(axis);
params.ori.mulV(local_axis);
@ -241,7 +241,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_Axis_PointRep(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
Point3F point_at_t = axis* mLerp(mA, mB,t);
*((Point3F*)(((char*)(&params)) + offset)) = point_at_t;
@ -255,7 +255,7 @@ protected:
U32 offset;
public:
afxXM_WaveInterp_Scalar_LocalAxis_PointRep(U32 o, Point3F ax) : afxXM_WaveInterp_Scalar() { offset = o; axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
Point3F local_axis(axis);
params.ori.mulV(local_axis);
@ -270,7 +270,7 @@ class afxXM_WaveInterp_Scalar_ColorAdd : public afxXM_WaveInterp_Scalar
{
public:
afxXM_WaveInterp_Scalar_ColorAdd() : afxXM_WaveInterp_Scalar() { }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
F32 scalar_at_t = mLerp(mA, mB,t);
LinearColorF color_at_t(scalar_at_t, scalar_at_t, scalar_at_t, scalar_at_t);
@ -284,7 +284,7 @@ class afxXM_WaveInterp_Scalar_ColorMul : public afxXM_WaveInterp_Scalar
{
public:
afxXM_WaveInterp_Scalar_ColorMul() : afxXM_WaveInterp_Scalar() { }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
params.color *= mLerp(mA, mB,t);
}
@ -296,7 +296,7 @@ class afxXM_WaveInterp_Scalar_ColorRep : public afxXM_WaveInterp_Scalar
{
public:
afxXM_WaveInterp_Scalar_ColorRep() : afxXM_WaveInterp_Scalar() { }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
F32 scalar_at_t = mLerp(mA, mB,t);
params.color.set(scalar_at_t, scalar_at_t, scalar_at_t, scalar_at_t);
@ -311,7 +311,7 @@ protected:
Point3F axis;
public:
afxXM_WaveInterp_Scalar_OriMul(Point3F& ax) : afxXM_WaveInterp_Scalar() { axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
F32 theta = mDegToRad(mLerp(mA, mB,t));
AngAxisF rot_aa(axis, theta);
@ -328,7 +328,7 @@ protected:
Point3F axis;
public:
afxXM_WaveInterp_Scalar_OriRep(Point3F& ax) : afxXM_WaveInterp_Scalar() { axis = ax; }
virtual void interpolate(F32 t, afxXM_Params& params)
void interpolate(F32 t, afxXM_Params& params) override
{
F32 theta = mDegToRad(mLerp(mA, mB,t));
AngAxisF rot_aa(axis, theta);
@ -586,14 +586,14 @@ public:
/*C*/ afxXM_WaveScalarData();
/*C*/ afxXM_WaveScalarData(const afxXM_WaveScalarData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_WaveScalarData);
};
@ -712,14 +712,14 @@ public:
/*C*/ afxXM_WaveRiderScalarData();
/*C*/ afxXM_WaveRiderScalarData(const afxXM_WaveRiderScalarData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) 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_WaveRiderScalarData);
};

8
Engine/source/afx/xm/afxXfmMod.h
View file

@ -83,8 +83,8 @@ public:
/*C*/ afxXM_BaseData();
/*C*/ afxXM_BaseData(const afxXM_BaseData&, bool = false);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();
@ -140,8 +140,8 @@ public:
bool hasFixedWeight() const;
F32 getWeightFactor() const;
void packData(BitStream* stream);
void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
static void initPersistFields();