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

6
Engine/source/T3D/assets/CppAsset.h
View file

@ -55,7 +55,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(CppAsset);
@ -67,8 +67,8 @@ public:
inline StringTableEntry getHeaderFile(void) const { return mHeaderFile; };
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setCppFile(void *obj, const char *index, const char *data) { static_cast<CppAsset*>(obj)->setCppFile(data); return false; }
static const char* getCppFile(void* obj, const char* data) { return static_cast<CppAsset*>(obj)->getCppFile(); }

12
Engine/source/T3D/assets/CubemapAsset.h
View file

@ -61,12 +61,12 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(CubemapAsset);
StringTableEntry getComponentName() { return mComponentName; }
StringTableEntry getComponentName() override { return mComponentName; }
StringTableEntry getComponentClass() { return mComponentClass; }
StringTableEntry getFriendlyName() { return mFriendlyName; }
StringTableEntry getComponentType() { return mComponentType; }
@ -84,8 +84,8 @@ public:
inline StringTableEntry getScriptFile(void) const { return mScriptFile; };
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<CubemapAsset*>(obj)->setScriptFile(data); return false; }
static const char* getScriptFile(void* obj, const char* data) { return static_cast<CubemapAsset*>(obj)->getScriptFile(); }
@ -106,8 +106,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeCubemapAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
#endif
#endif // _ASSET_BASE_H_

6
Engine/source/T3D/assets/ExampleAsset.h
View file

@ -49,14 +49,14 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(ExampleAsset);
protected:
virtual void initializeAsset(void) {}
virtual void onAssetRefresh(void) {}
void initializeAsset(void) override {}
void onAssetRefresh(void) override {}
};
DefineConsoleType(TypeExampleAssetPtr, ExampleAsset)

10
Engine/source/T3D/assets/GUIAsset.h
View file

@ -58,7 +58,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
static StringTableEntry getAssetIdByGUIName(StringTableEntry guiName);
@ -74,8 +74,8 @@ public:
inline StringTableEntry getScriptPath(void) const { return mScriptPath; };
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setGUIFile(void *obj, const char *index, const char *data) { static_cast<GUIAsset*>(obj)->setGUIFile(data); return false; }
static const char* getGUIFile(void* obj, const char* data) { return static_cast<GUIAsset*>(obj)->getGUIFile(); }
@ -99,8 +99,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeGUIAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
#endif
#endif // _ASSET_BASE_H_

10
Engine/source/T3D/assets/GameObjectAsset.h
View file

@ -59,7 +59,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
const char* create();
@ -72,8 +72,8 @@ public:
inline StringTableEntry getTAMLFile(void) const { return mTAMLFile; };
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<GameObjectAsset*>(obj)->setScriptFile(data); return false; }
static const char* getScriptFile(void* obj, const char* data) { return static_cast<GameObjectAsset*>(obj)->getScriptFile(); }
@ -100,8 +100,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeGameObjectAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
#endif
#endif // _ASSET_BASE_H_

2
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -131,7 +131,7 @@ const String ImageAsset::mErrCodeStrings[] =
"UnKnown"
};
//-----------------------------------------------------------------------------
ImageAsset::ImageAsset() : AssetBase(), mUseMips(true), mIsHDRImage(false), mIsValidImage(false), mImageType(Albedo)
ImageAsset::ImageAsset() : AssetBase(), mIsValidImage(false), mUseMips(true), mIsHDRImage(false), mImageType(Albedo)
{
mImageFileName = StringTable->EmptyString();
mImagePath = StringTable->EmptyString();

6
Engine/source/T3D/assets/ImageAsset.h
View file

@ -119,7 +119,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(ImageAsset);
@ -154,8 +154,8 @@ public:
U32 load();
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setImageFileName(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ImageAsset*>(obj)->setImageFileName(data); return false; }
static StringTableEntry getImageFileName(void* obj, StringTableEntry data) { return static_cast<ImageAsset*>(obj)->getImageFileName(); }

6
Engine/source/T3D/assets/ImageAssetInspectors.h
View file

@ -21,11 +21,11 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeImageAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
bool renderTooltip(const Point2I& hoverPos, const Point2I& cursorPos, const char* tipText = NULL);
virtual void updateValue();
void updateValue() override;
void updatePreviewImage();
void setPreviewImage(StringTableEntry assetId);

6
Engine/source/T3D/assets/LevelAsset.h
View file

@ -77,7 +77,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(LevelAsset);
@ -133,8 +133,8 @@ protected:
static const char* getNavmeshFile(void* obj, const char* data) { return static_cast<LevelAsset*>(obj)->getNavmeshFile(); }
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
void loadAsset();
};

12
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -102,7 +102,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
U32 load();
@ -130,8 +130,8 @@ public:
DECLARE_CONOBJECT(MaterialAsset);
protected:
virtual void initializeAsset();
virtual void onAssetRefresh(void);
void initializeAsset() override;
void onAssetRefresh(void) override;
static bool setScriptFile(void *obj, const char *index, const char *data)
{
@ -160,10 +160,10 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeMaterialAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
virtual void updateValue();
void updateValue() override;
void updatePreviewImage();
void setPreviewImage(StringTableEntry assetId);

10
Engine/source/T3D/assets/ParticleAsset.h
View file

@ -55,14 +55,14 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(ParticleAsset);
protected:
virtual void initializeAsset(void) {}
virtual void onAssetRefresh(void) {}
void initializeAsset(void) override {}
void onAssetRefresh(void) override {}
};
DefineConsoleType(TypeParticleAssetPtr, ParticleAsset)
@ -81,8 +81,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeParticleAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
#endif
#endif // _ASSET_BASE_H_

6
Engine/source/T3D/assets/PostEffectAsset.h
View file

@ -60,7 +60,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
void setScriptFile(const char* pScriptFile);
inline StringTableEntry getScriptFile(void) const { return mScriptFile; };
@ -78,8 +78,8 @@ public:
DECLARE_CONOBJECT(PostEffectAsset);
protected:
virtual void initializeAsset();
virtual void onAssetRefresh(void);
void initializeAsset() override;
void onAssetRefresh(void) override;
static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<PostEffectAsset*>(obj)->setScriptFile(data); return false; }
static const char* getScriptFile(void* obj, const char* data) { return static_cast<PostEffectAsset*>(obj)->getScriptFile(); }

8
Engine/source/T3D/assets/ScriptAsset.h
View file

@ -60,7 +60,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(ScriptAsset);
@ -77,9 +77,9 @@ public:
DECLARE_CALLBACK(void, onUnloadAsset, ());
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
virtual void unloadAsset(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
void unloadAsset(void) override;
static bool setScriptFile(void *obj, const char *index, const char *data) { static_cast<ScriptAsset*>(obj)->setScriptFile(data); return false; }
static const char* getScriptFile(void* obj, const char* data) { return static_cast<ScriptAsset*>(obj)->getScriptFile(); }

6
Engine/source/T3D/assets/ShapeAnimationAsset.h
View file

@ -98,7 +98,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
void setAnimationFile(const char* pAnimationFile);
inline StringTableEntry getAnimationFile(void) const { return mFileName; };
@ -109,8 +109,8 @@ public:
DECLARE_CONOBJECT(ShapeAnimationAsset);
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setAnimationFile(void *obj, const char *index, const char *data) { static_cast<ShapeAnimationAsset*>(obj)->setAnimationFile(data); return false; }
static const char* getAnimationFile(void* obj, const char* data) { return static_cast<ShapeAnimationAsset*>(obj)->getAnimationFile(); }

12
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -123,11 +123,11 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
virtual void setDataField(StringTableEntry slotName, StringTableEntry array, StringTableEntry value);
virtual void initializeAsset();
void initializeAsset() override;
/// Declare Console Object.
DECLARE_CONOBJECT(ShapeAsset);
@ -195,7 +195,7 @@ public:
#endif
protected:
virtual void onAssetRefresh(void);
void onAssetRefresh(void) override;
static bool setShapeFile(void* obj, StringTableEntry index, StringTableEntry data) { static_cast<ShapeAsset*>(obj)->setShapeFile(data); return false; }
static const char* getShapeFile(void* obj, const char* data) { return static_cast<ShapeAsset*>(obj)->getShapeFile(); }
@ -229,10 +229,10 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeShapeAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
virtual void updateValue();
void updateValue() override;
void updatePreviewImage();
void setPreviewImage(StringTableEntry assetId);

6
Engine/source/T3D/assets/SoundAsset.h
View file

@ -147,7 +147,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
//SFXResource* getSound() { return mSoundResource; }
Resource<SFXResource> getSoundResource(const U32 slotId = 0) { load(); return mSFXProfile[slotId].getResource(); }
@ -172,9 +172,9 @@ public:
static U32 getAssetByFileName(StringTableEntry fileName, AssetPtr<SoundAsset>* matAsset);
protected:
virtual void initializeAsset(void);
void initializeAsset(void) override;
void _onResourceChanged(const Torque::Path & path);
virtual void onAssetRefresh(void);
void onAssetRefresh(void) override;
};
DefineConsoleType(TypeSoundAssetPtr, SoundAsset)

4
Engine/source/T3D/assets/SoundAssetInspectors.h
View file

@ -17,8 +17,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeSoundAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
class GuiInspectorTypeSoundAssetId : public GuiInspectorTypeSoundAssetPtr

10
Engine/source/T3D/assets/TerrainAsset.h
View file

@ -72,7 +72,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
virtual void setDataField(StringTableEntry slotName, const char* array, const char* value);
@ -92,8 +92,8 @@ public:
DECLARE_CONOBJECT(TerrainAsset);
protected:
virtual void initializeAsset();
virtual void onAssetRefresh(void);
void initializeAsset() override;
void onAssetRefresh(void) override;
static bool setTerrainFileName(void *obj, const char *index, const char *data) { static_cast<TerrainAsset*>(obj)->setTerrainFileName(data); return false; }
static const char* getTerrainFileName(void* obj, const char* data) { return static_cast<TerrainAsset*>(obj)->getTerrainFileName(); }
@ -115,8 +115,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeTerrainAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
class GuiInspectorTypeTerrainAssetId : public GuiInspectorTypeTerrainAssetPtr

10
Engine/source/T3D/assets/TerrainMaterialAsset.h
View file

@ -87,7 +87,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
U32 load();
@ -117,8 +117,8 @@ public:
DECLARE_CONOBJECT(TerrainMaterialAsset);
protected:
virtual void initializeAsset();
virtual void onAssetRefresh(void);
void initializeAsset() override;
void onAssetRefresh(void) override;
static bool setScriptFile(void *obj, const char *index, const char *data)
{
@ -144,8 +144,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeTerrainMaterialAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
class GuiInspectorTypeTerrainMaterialAssetId : public GuiInspectorTypeTerrainMaterialAssetPtr
{

12
Engine/source/T3D/assets/assetImporter.h
View file

@ -432,8 +432,8 @@ public:
AssetImportConfig();
virtual ~AssetImportConfig();
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
/// Engine.
static void initPersistFields();
@ -571,8 +571,8 @@ public:
AssetImportObject();
virtual ~AssetImportObject();
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
/// Engine.
static void initPersistFields();
@ -663,8 +663,8 @@ public:
AssetImporter();
virtual ~AssetImporter();
virtual bool onAdd();
virtual void onRemove();
bool onAdd() override;
void onRemove() override;
/// Engine.
static void initPersistFields();

10
Engine/source/T3D/assets/stateMachineAsset.h
View file

@ -55,7 +55,7 @@ public:
/// Engine.
static void initPersistFields();
virtual void copyTo(SimObject* object);
void copyTo(SimObject* object) override;
/// Declare Console Object.
DECLARE_CONOBJECT(StateMachineAsset);
@ -66,8 +66,8 @@ public:
inline StringTableEntry getStateMachinePath(void) const { return mStateMachinePath; };
protected:
virtual void initializeAsset(void);
virtual void onAssetRefresh(void);
void initializeAsset(void) override;
void onAssetRefresh(void) override;
static bool setStateMachineFile(void *obj, const char *index, const char *data) { static_cast<StateMachineAsset*>(obj)->setStateMachineFile(data); return false; }
static const char* getStateMachineFile(void* obj, const char* data) { return static_cast<StateMachineAsset*>(obj)->getStateMachineFile(); }
@ -88,8 +88,8 @@ public:
DECLARE_CONOBJECT(GuiInspectorTypeStateMachineAssetPtr);
static void consoleInit();
virtual GuiControl* constructEditControl();
virtual bool updateRects();
GuiControl* constructEditControl() override;
bool updateRects() override;
};
#endif
#endif