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

22
Engine/source/ts/collada/colladaAppNode.h
View file

@ -39,8 +39,8 @@ class ColladaAppNode : public AppNode
friend class ColladaAppMesh;
MatrixF getTransform(F32 time);
void buildMeshList();
void buildChildList();
void buildMeshList() override;
void buildChildList() override;
protected:
@ -69,10 +69,10 @@ public:
const domNode* getDomNode() const { return p_domNode; }
//-----------------------------------------------------------------------
const char *getName() { return mName; }
const char *getParentName() { return mParentName; }
const char *getName() override { return mName; }
const char *getParentName() override { return mParentName; }
bool isEqual(AppNode* node)
bool isEqual(AppNode* node) override
{
const ColladaAppNode* appNode = dynamic_cast<const ColladaAppNode*>(node);
return (appNode && (appNode->p_domNode == p_domNode));
@ -80,21 +80,21 @@ public:
// Property look-ups: only float properties are stored, the rest are
// converted from floats as needed
bool getFloat(const char* propName, F32& defaultVal)
bool getFloat(const char* propName, F32& defaultVal) override
{
Map<StringTableEntry,F32>::Iterator itr = mProps.find(propName);
if (itr != mProps.end())
defaultVal = itr->value;
return false;
}
bool getInt(const char* propName, S32& defaultVal)
bool getInt(const char* propName, S32& defaultVal) override
{
F32 value = defaultVal;
bool ret = getFloat(propName, value);
defaultVal = (S32)value;
return ret;
}
bool getBool(const char* propName, bool& defaultVal)
bool getBool(const char* propName, bool& defaultVal) override
{
F32 value = defaultVal;
bool ret = getFloat(propName, value);
@ -102,9 +102,9 @@ public:
return ret;
}
MatrixF getNodeTransform(F32 time);
bool animatesTransform(const AppSequence* appSeq);
bool isParentRoot() { return (appParent == NULL); }
MatrixF getNodeTransform(F32 time) override;
bool animatesTransform(const AppSequence* appSeq) override;
bool isParentRoot() override { return (appParent == NULL); }
};
#endif // _COLLADA_APPNODE_H_

8
Engine/source/ts/collada/colladaShapeLoader.h
View file

@ -47,10 +47,10 @@ public:
ColladaShapeLoader(domCOLLADA* _root);
~ColladaShapeLoader();
void enumerateScene();
bool ignoreNode(const String& name);
bool ignoreMesh(const String& name);
void computeBounds(Box3F& bounds);
void enumerateScene() override;
bool ignoreNode(const String& name) override;
bool ignoreMesh(const String& name) override;
void computeBounds(Box3F& bounds) override;
static bool canLoadCachedDTS(const Torque::Path& path);
static bool checkAndMountSketchup(const Torque::Path& path, String& mountPoint, Torque::Path& daePath);

10
Engine/source/ts/collada/colladaUtils.h
View file

@ -672,14 +672,14 @@ public:
}
/// Most primitives can use these common implementations
const char* getElementName() { return primitive->getElementName(); }
const char* getMaterial() { return (FindMatch::isMatchMultipleExprs(ColladaUtils::getOptions().neverImportMat, primitive->getMaterial(), false)) ? NULL : primitive->getMaterial(); }
const domInputLocalOffset_Array& getInputs() { return primitive->getInput_array(); }
S32 getStride() const { return stride; }
const char* getElementName() override { return primitive->getElementName(); }
const char* getMaterial() override { return (FindMatch::isMatchMultipleExprs(ColladaUtils::getOptions().neverImportMat, primitive->getMaterial(), false)) ? NULL : primitive->getMaterial(); }
const domInputLocalOffset_Array& getInputs() override { return primitive->getInput_array(); }
S32 getStride() const override { return stride; }
/// Each supported primitive needs to implement this method (and convert
/// to triangles if required)
const domListOfUInts *getTriangleData() { return NULL; }
const domListOfUInts *getTriangleData() override { return NULL; }
};
//-----------------------------------------------------------------------------