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

virtuals removed

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

30
Engine/source/T3D/vehicles/flyingVehicle.h
View file

@ -107,9 +107,9 @@ struct FlyingVehicleData: public VehicleData {
FlyingVehicleData();
DECLARE_CONOBJECT(FlyingVehicleData);
static void initPersistFields();
bool preload(bool server, String &errorStr);
void packData(BitStream* stream);
void unpackData(BitStream* stream);
bool preload(bool server, String &errorStr) override;
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
};
@ -166,9 +166,9 @@ class FlyingVehicle: public Vehicle
SimObjectPtr<ParticleEmitter> mJetEmitter[FlyingVehicleData::MaxJetNodes];
//
bool onNewDataBlock(GameBaseData* dptr,bool reload);
void updateMove(const Move *move);
void updateForces(F32);
bool onNewDataBlock(GameBaseData* dptr,bool reload) override;
void updateMove(const Move *move) override;
void updateForces(F32) override;
// bool collideBody(const MatrixF& mat,Collision* info);
F32 getHeight();
@ -177,7 +177,7 @@ class FlyingVehicle: public Vehicle
void updateEngineSound(F32 level);
void updateEmitter(bool active,F32 dt,ParticleEmitterData *emitter,S32 idx,S32 count);
U32 getCollisionMask();
U32 getCollisionMask() override;
public:
DECLARE_CONOBJECT(FlyingVehicle);
DECLARE_CATEGORY("Actor \t Controllable");
@ -186,15 +186,15 @@ class FlyingVehicle: public Vehicle
FlyingVehicle();
~FlyingVehicle();
bool onAdd();
void onRemove();
void interpolateTick(F32 dt);
void advanceTime(F32 dt);
bool onAdd() override;
void onRemove() override;
void interpolateTick(F32 dt) override;
void advanceTime(F32 dt) override;
void writePacketData(GameConnection *conn, BitStream *stream);
void readPacketData(GameConnection *conn, BitStream *stream);
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
void writePacketData(GameConnection *conn, BitStream *stream) override;
void readPacketData(GameConnection *conn, BitStream *stream) override;
U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
void useCreateHeight(bool val);
};

2
Engine/source/T3D/vehicles/guiSpeedometer.cpp
View file

@ -51,7 +51,7 @@ class GuiSpeedometerHud : public GuiBitmapCtrl
public:
GuiSpeedometerHud();
void onRender( Point2I, const RectI &);
void onRender( Point2I, const RectI &) override;
static void initPersistFields();
DECLARE_CONOBJECT( GuiSpeedometerHud );
DECLARE_CATEGORY( "Gui Game" );

26
Engine/source/T3D/vehicles/hoverVehicle.h
View file

@ -36,7 +36,7 @@ class HoverVehicleData : public VehicleData
typedef VehicleData Parent;
protected:
bool onAdd();
bool onAdd() override;
//-------------------------------------- Console set variables
public:
@ -112,9 +112,9 @@ class HoverVehicleData : public VehicleData
HoverVehicleData();
~HoverVehicleData();
void packData(BitStream*);
void unpackData(BitStream*);
bool preload(bool server, String &errorStr);
void packData(BitStream*) override;
void unpackData(BitStream*) override;
bool preload(bool server, String &errorStr) override;
DECLARE_CONOBJECT(HoverVehicleData);
static void initPersistFields();
@ -131,18 +131,18 @@ class HoverVehicle : public Vehicle
SimObjectPtr<ParticleEmitter> mDustTrailEmitter;
protected:
bool onAdd();
void onRemove();
bool onNewDataBlock(GameBaseData *dptr,bool reload);
bool onAdd() override;
void onRemove() override;
bool onNewDataBlock(GameBaseData *dptr,bool reload) override;
void updateDustTrail( F32 dt );
// Vehicle overrides
protected:
void updateMove(const Move *move);
void updateMove(const Move *move) override;
// Physics
protected:
void updateForces(F32);
void updateForces(F32) override;
F32 getBaseStabilizerLength() const;
bool mFloating;
@ -188,7 +188,7 @@ class HoverVehicle : public Vehicle
static JetActivation sJetActivation[NumThrustDirections];
SimObjectPtr<ParticleEmitter> mJetEmitter[HoverVehicleData::MaxJetNodes];
U32 getCollisionMask();
U32 getCollisionMask() override;
void updateJet(F32 dt);
void updateEmitter(bool active,F32 dt,ParticleEmitterData *emitter,S32 idx,S32 count);
public:
@ -197,14 +197,14 @@ class HoverVehicle : public Vehicle
// Time/Move Management
public:
void advanceTime(F32 dt);
void advanceTime(F32 dt) override;
DECLARE_CONOBJECT(HoverVehicle);
DECLARE_CATEGORY("Actor \t Controllable");
// static void initPersistFields();
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
};
#endif // _H_HOVERVEHICLE

34
Engine/source/T3D/vehicles/vehicle.h
View file

@ -73,10 +73,10 @@ struct VehicleData : public RigidShapeData
//
VehicleData();
bool preload(bool server, String &errorStr);
bool preload(bool server, String &errorStr) override;
static void initPersistFields();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
DECLARE_CONOBJECT(VehicleData);
};
@ -104,7 +104,7 @@ class Vehicle : public RigidShape
SimObjectPtr<ParticleEmitter> mDamageEmitterList[VehicleData::VC_NUM_DAMAGE_EMITTERS];
//
virtual bool onNewDataBlock( GameBaseData *dptr, bool reload );
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
void updatePos(F32 dt);
static void findCallback(SceneObject* obj,void * key);
@ -112,11 +112,11 @@ class Vehicle : public RigidShape
virtual void updateMove(const Move* move);
virtual void updateForces(F32 dt);
void writePacketData(GameConnection * conn, BitStream *stream);
void readPacketData (GameConnection * conn, BitStream *stream);
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
void setControllingClient(GameConnection* connection);
void writePacketData(GameConnection * conn, BitStream *stream) override;
void readPacketData (GameConnection * conn, BitStream *stream) override;
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
void setControllingClient(GameConnection* connection) override;
void updateLiftoffDust( F32 dt );
void updateDamageSmoke( F32 dt );
@ -142,26 +142,26 @@ public:
Vehicle();
static void consoleInit();
static void initPersistFields();
void processTick(const Move *move);
bool onAdd();
void onRemove();
void processTick(const Move *move) override;
bool onAdd() override;
void onRemove() override;
/// Interpolates between move ticks @see processTick
/// @param dt Change in time between the last call and this call to the function
void advanceTime(F32 dt);
void advanceTime(F32 dt) override;
void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex );
void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override;
///@name Rigid body methods
///@{
void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot);
void getCameraTransform(F32* pos, MatrixF* mat);
void getCameraParameters(F32 *min, F32* max, Point3F* offset, MatrixF* rot) override;
void getCameraTransform(F32* pos, MatrixF* mat) override;
///@}
/// @name Mounted objects
/// @{
virtual void mountObject( SceneObject *obj, S32 node, const MatrixF &xfm = MatrixF::Identity );
void mountObject( SceneObject *obj, S32 node, const MatrixF &xfm = MatrixF::Identity ) override;
/// @}
DECLARE_CONOBJECT(Vehicle);

10
Engine/source/T3D/vehicles/vehicleBlocker.h
View file

@ -37,11 +37,11 @@ class VehicleBlocker : public SceneObject
friend class VehicleBlockerConvex;
protected:
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
// Collision
void buildConvex(const Box3F& box, Convex* convex);
void buildConvex(const Box3F& box, Convex* convex) override;
protected:
Convex* mConvexList;
@ -55,8 +55,8 @@ class VehicleBlocker : public SceneObject
DECLARE_CATEGORY("Volume");
static void initPersistFields();
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
};
#endif // _H_VEHICLEBLOCKER

44
Engine/source/T3D/vehicles/wheeledVehicle.h
View file

@ -70,9 +70,9 @@ struct WheeledVehicleTire: public SimDataBlock
WheeledVehicleTire();
DECLARE_CONOBJECT(WheeledVehicleTire);
static void initPersistFields();
bool preload(bool, String &errorStr);
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
bool preload(bool, String &errorStr) override;
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
void onShapeChanged() {}
};
@ -93,8 +93,8 @@ struct WheeledVehicleSpring: public SimDataBlock
WheeledVehicleSpring();
DECLARE_CONOBJECT(WheeledVehicleSpring);
static void initPersistFields();
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
};
@ -146,10 +146,10 @@ struct WheeledVehicleData: public VehicleData
WheeledVehicleData();
DECLARE_CONOBJECT(WheeledVehicleData);
static void initPersistFields();
bool preload(bool, String &errorStr);
bool preload(bool, String &errorStr) override;
bool mirrorWheel(Wheel* we);
virtual void packData(BitStream* stream);
virtual void unpackData(BitStream* stream);
void packData(BitStream* stream) override;
void unpackData(BitStream* stream) override;
};
@ -207,12 +207,12 @@ class WheeledVehicle: public Vehicle
TSThread* mSteeringThread;
//
bool onNewDataBlock( GameBaseData *dptr, bool reload );
void processTick(const Move *move);
void updateMove(const Move *move);
void updateForces(F32 dt);
bool onNewDataBlock( GameBaseData *dptr, bool reload ) override;
void processTick(const Move *move) override;
void updateMove(const Move *move) override;
void updateForces(F32 dt) override;
void extendWheels(bool clientHack = false);
void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex );
void prepBatchRender( SceneRenderState *state, S32 mountedImageIndex ) override;
// Client sounds & particles
void updateWheelThreads();
@ -221,7 +221,7 @@ class WheeledVehicle: public Vehicle
void updateSquealSound(F32 level);
void updateJetSound();
virtual U32 getCollisionMask();
U32 getCollisionMask() override;
public:
DECLARE_CONOBJECT(WheeledVehicle);
@ -231,10 +231,10 @@ public:
WheeledVehicle();
~WheeledVehicle();
bool onAdd();
void onRemove();
void advanceTime(F32 dt);
bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere);
bool onAdd() override;
void onRemove() override;
void advanceTime(F32 dt) override;
bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override;
S32 getWheelCount();
Wheel *getWheel(U32 index) {return &mWheel[index];}
@ -245,10 +245,10 @@ public:
void getWheelInstAndTransform( U32 wheel, TSShapeInstance** inst, MatrixF* xfrm ) const;
void writePacketData(GameConnection * conn, BitStream *stream);
void readPacketData(GameConnection * conn, BitStream *stream);
U32 packUpdate(NetConnection * conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection * conn, BitStream *stream);
void writePacketData(GameConnection * conn, BitStream *stream) override;
void readPacketData(GameConnection * conn, BitStream *stream) override;
U32 packUpdate(NetConnection * conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection * conn, BitStream *stream) override;
};