mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-12 07:04:36 +00:00
rest of virtuals removed
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:
parent
efbe5e90f5
commit
2b295fb7f0
454 changed files with 4162 additions and 4156 deletions
|
|
@ -53,7 +53,7 @@ public:
|
|||
ColladaAppMaterial(const domMaterial* pMat);
|
||||
~ColladaAppMaterial() { delete effectExt; }
|
||||
|
||||
String getName() const { return name; }
|
||||
String getName() const override { return name; }
|
||||
|
||||
void resolveFloat(const domCommon_float_or_param_type* value, F32* dst);
|
||||
void resolveColor(const domCommon_color_or_texture_type* value, LinearColorF* dst);
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ public:
|
|||
/// Get the name of this mesh
|
||||
///
|
||||
/// @return A string containing the name of this mesh
|
||||
const char *getName(bool allowFixed=true);
|
||||
const char *getName(bool allowFixed=true) override;
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
|
|
@ -145,7 +145,7 @@ public:
|
|||
/// @param defaultVal Reference to variable to hold return value
|
||||
///
|
||||
/// @return True if a value was set, false if not
|
||||
bool getFloat(const char *propName, F32 &defaultVal)
|
||||
bool getFloat(const char *propName, F32 &defaultVal) override
|
||||
{
|
||||
return appNode->getFloat(propName,defaultVal);
|
||||
}
|
||||
|
|
@ -156,7 +156,7 @@ public:
|
|||
/// @param defaultVal Reference to variable to hold return value
|
||||
///
|
||||
/// @return True if a value was set, false if not
|
||||
bool getInt(const char *propName, S32 &defaultVal)
|
||||
bool getInt(const char *propName, S32 &defaultVal) override
|
||||
{
|
||||
return appNode->getInt(propName,defaultVal);
|
||||
}
|
||||
|
|
@ -167,13 +167,13 @@ public:
|
|||
/// @param defaultVal Reference to variable to hold return value
|
||||
///
|
||||
/// @return True if a value was set, false if not
|
||||
bool getBool(const char *propName, bool &defaultVal)
|
||||
bool getBool(const char *propName, bool &defaultVal) override
|
||||
{
|
||||
return appNode->getBool(propName,defaultVal);
|
||||
}
|
||||
|
||||
/// Return true if this mesh is a skin
|
||||
bool isSkin()
|
||||
bool isSkin() override
|
||||
{
|
||||
if (instanceCtrl) {
|
||||
const domController* ctrl = daeSafeCast<domController>(instanceCtrl->getUrl().getElement());
|
||||
|
|
@ -185,48 +185,48 @@ public:
|
|||
}
|
||||
|
||||
/// Get the skin data: bones, vertex weights etc
|
||||
void lookupSkinData();
|
||||
void lookupSkinData() override;
|
||||
|
||||
/// Check if the mesh visibility is animated
|
||||
///
|
||||
/// @param appSeq Start/end time to check
|
||||
///
|
||||
/// @return True if the mesh visibility is animated, false if not
|
||||
bool animatesVis(const AppSequence* appSeq);
|
||||
bool animatesVis(const AppSequence* appSeq) override;
|
||||
|
||||
/// Check if the material used by this mesh is animated
|
||||
///
|
||||
/// @param appSeq Start/end time to check
|
||||
///
|
||||
/// @return True if the material is animated, false if not
|
||||
bool animatesMatFrame(const AppSequence* appSeq);
|
||||
bool animatesMatFrame(const AppSequence* appSeq) override;
|
||||
|
||||
/// Check if the mesh is animated
|
||||
///
|
||||
/// @param appSeq Start/end time to check
|
||||
///
|
||||
/// @return True if the mesh is animated, false if not
|
||||
bool animatesFrame(const AppSequence* appSeq);
|
||||
bool animatesFrame(const AppSequence* appSeq) override;
|
||||
|
||||
/// Generate the vertex, normal and triangle data for the mesh.
|
||||
///
|
||||
/// @param time Time at which to generate the mesh data
|
||||
/// @param objOffset Transform to apply to the generated data (bounds transform)
|
||||
void lockMesh(F32 time, const MatrixF& objOffset);
|
||||
void lockMesh(F32 time, const MatrixF& objOffset) override;
|
||||
|
||||
/// Get the transform of this mesh at a certain time
|
||||
///
|
||||
/// @param time Time at which to get the transform
|
||||
///
|
||||
/// @return The mesh transform at the specified time
|
||||
MatrixF getMeshTransform(F32 time);
|
||||
MatrixF getMeshTransform(F32 time) override;
|
||||
|
||||
/// Get the visibility of this mesh at a certain time
|
||||
///
|
||||
/// @param time Time at which to get visibility info
|
||||
///
|
||||
/// @return Visibility from 0 (invisible) to 1 (opaque)
|
||||
F32 getVisValue(F32 time);
|
||||
F32 getVisValue(F32 time) override;
|
||||
};
|
||||
|
||||
#endif // _COLLADA_APPMESH_H_
|
||||
|
|
|
|||
|
|
@ -44,20 +44,20 @@ public:
|
|||
ColladaAppSequence(const domAnimation_clip* clip);
|
||||
~ColladaAppSequence();
|
||||
|
||||
void setActive(bool active);
|
||||
void setActive(bool active) override;
|
||||
|
||||
const domAnimation_clip* getClip() const { return pClip; }
|
||||
|
||||
S32 getNumTriggers();
|
||||
void getTrigger(S32 index, TSShape::Trigger& trigger);
|
||||
|
||||
const char* getName() const;
|
||||
const char* getName() const override;
|
||||
|
||||
F32 getStart() const { return seqStart; }
|
||||
F32 getEnd() const { return seqEnd; }
|
||||
F32 getStart() const override { return seqStart; }
|
||||
F32 getEnd() const override { return seqEnd; }
|
||||
void setEnd(F32 end) { seqEnd = end; }
|
||||
|
||||
U32 getFlags() const;
|
||||
U32 getFlags() const override;
|
||||
F32 getPriority();
|
||||
F32 getBlendRefTime();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -68,12 +68,12 @@ static FileTime sLastModTime; // Modification time of the last loaded Collada
|
|||
// Custom warning/error message handler
|
||||
class myErrorHandler : public daeErrorHandler
|
||||
{
|
||||
void handleError( daeString msg )
|
||||
void handleError( daeString msg ) override
|
||||
{
|
||||
Con::errorf("Error: %s", msg);
|
||||
}
|
||||
|
||||
void handleWarning( daeString msg )
|
||||
void handleWarning( daeString msg ) override
|
||||
{
|
||||
Con::errorf("Warning: %s", msg);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue