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

virtuals removed

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

30
Engine/source/terrain/terrData.h
View file

@ -300,11 +300,11 @@ public:
Resource<TerrainFile> getFile() const { return mFile; };
bool onAdd();
void onRemove();
bool onAdd() override;
void onRemove() override;
void onEditorEnable();
void onEditorDisable();
void onEditorEnable() override;
void onEditorDisable() override;
/// Adds a new material as the top layer or
/// inserts it at the specified index.
@ -418,7 +418,7 @@ public:
StringTableEntry &matName ) const;
// only the editor currently uses this method - should always be using a ray to collide with
bool collideBox( const Point3F &start, const Point3F &end, RayInfo* info )
bool collideBox( const Point3F &start, const Point3F &end, RayInfo* info ) override
{
return castRay( start, end, info );
}
@ -461,14 +461,14 @@ public:
U32 getScreenError() const { return smLODScale * mScreenError; }
// SceneObject
void setTransform( const MatrixF &mat );
void setScale( const VectorF &scale );
void setTransform( const MatrixF &mat ) override;
void setScale( const VectorF &scale ) override;
void prepRenderImage ( SceneRenderState* state );
void prepRenderImage ( SceneRenderState* state ) override;
void buildConvex(const Box3F& box,Convex* convex);
bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere);
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info);
void buildConvex(const Box3F& box,Convex* convex) override;
bool buildPolyList(PolyListContext context, AbstractPolyList* polyList, const Box3F &box, const SphereF &sphere) override;
bool castRay(const Point3F &start, const Point3F &end, RayInfo* info) override;
bool castRayI(const Point3F &start, const Point3F &end, RayInfo* info, bool emptyCollide);
bool castRayBlock( const Point3F &pStart,
@ -490,11 +490,11 @@ public:
DECLARE_CONOBJECT(TerrainBlock);
DECLARE_CATEGORY("Environment \t BackGround");
static void initPersistFields();
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream);
void unpackUpdate(NetConnection *conn, BitStream *stream);
void inspectPostApply();
U32 packUpdate (NetConnection *conn, U32 mask, BitStream *stream) override;
void unpackUpdate(NetConnection *conn, BitStream *stream) override;
void inspectPostApply() override;
virtual void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList);
void getUtilizedAssets(Vector<StringTableEntry>* usedAssetsList) override;
const StringTableEntry getTerrain() const
{

2
Engine/source/terrain/terrMaterial.h
View file

@ -104,7 +104,7 @@ public:
TerrainMaterial();
virtual ~TerrainMaterial();
bool onAdd();
bool onAdd() override;
static void initPersistFields();
DECLARE_CONOBJECT( TerrainMaterial );