General: Add missing override specifiers where applicable
This commit is contained in:
parent
46926ef4bf
commit
4b3af988ad
|
@ -108,7 +108,7 @@ public:
|
||||||
: CResource(pEntry)
|
: CResource(pEntry)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
~CAnimSet()
|
~CAnimSet() override
|
||||||
{
|
{
|
||||||
// For MP2, anim events need to be cleaned up manually
|
// For MP2, anim events need to be cleaned up manually
|
||||||
for ([[maybe_unused]] const auto& event : mAnimEvents)
|
for ([[maybe_unused]] const auto& event : mAnimEvents)
|
||||||
|
@ -117,7 +117,7 @@ public:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override
|
||||||
{
|
{
|
||||||
auto pTree = std::make_unique<CDependencyTree>();
|
auto pTree = std::make_unique<CDependencyTree>();
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
: CResource(pEntry)
|
: CResource(pEntry)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
~CSourceAnimData() = default;
|
~CSourceAnimData() override = default;
|
||||||
|
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override
|
||||||
{
|
{
|
||||||
|
|
|
@ -100,7 +100,7 @@ protected:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CMetaAnimBlend(EMetaAnimType Type, IInputStream& rInput, EGame Game);
|
CMetaAnimBlend(EMetaAnimType Type, IInputStream& rInput, EGame Game);
|
||||||
~CMetaAnimBlend();
|
~CMetaAnimBlend() override;
|
||||||
EMetaAnimType Type() const override;
|
EMetaAnimType Type() const override;
|
||||||
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ protected:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CMetaAnimRandom(IInputStream& rInput, EGame Game);
|
CMetaAnimRandom(IInputStream& rInput, EGame Game);
|
||||||
~CMetaAnimRandom();
|
~CMetaAnimRandom() override;
|
||||||
EMetaAnimType Type() const override;
|
EMetaAnimType Type() const override;
|
||||||
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
||||||
};
|
};
|
||||||
|
@ -139,7 +139,7 @@ protected:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CMetaAnimSequence(IInputStream& rInput, EGame Game);
|
CMetaAnimSequence(IInputStream& rInput, EGame Game);
|
||||||
~CMetaAnimSequence();
|
~CMetaAnimSequence() override;
|
||||||
EMetaAnimType Type() const override;
|
EMetaAnimType Type() const override;
|
||||||
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -44,7 +44,7 @@ class CMetaTransMetaAnim : public IMetaTransition
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CMetaTransMetaAnim(IInputStream& rInput, EGame Game);
|
CMetaTransMetaAnim(IInputStream& rInput, EGame Game);
|
||||||
~CMetaTransMetaAnim();
|
~CMetaTransMetaAnim() override;
|
||||||
EMetaTransType Type() const override;
|
EMetaTransType Type() const override;
|
||||||
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -68,7 +68,7 @@ class CGameArea : public CResource
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CGameArea(CResourceEntry *pEntry = nullptr);
|
explicit CGameArea(CResourceEntry *pEntry = nullptr);
|
||||||
~CGameArea();
|
~CGameArea() override;
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
||||||
|
|
||||||
void AddWorldModel(std::unique_ptr<CModel>&& pModel);
|
void AddWorldModel(std::unique_ptr<CModel>&& pModel);
|
||||||
|
|
|
@ -45,7 +45,7 @@ public:
|
||||||
[&rkID](const auto& entry) { return entry == rkID; });
|
[&rkID](const auto& entry) { return entry == rkID; });
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override
|
||||||
{
|
{
|
||||||
auto pTree = std::make_unique<CDependencyTree>();
|
auto pTree = std::make_unique<CDependencyTree>();
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ class CFont : public CResource
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CFont(CResourceEntry *pEntry = nullptr);
|
explicit CFont(CResourceEntry *pEntry = nullptr);
|
||||||
~CFont();
|
~CFont() override;
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
||||||
CVector2f RenderString(const TString& rkString, CRenderer *pRenderer, float AspectRatio,
|
CVector2f RenderString(const TString& rkString, CRenderer *pRenderer, float AspectRatio,
|
||||||
CVector2f Position = CVector2f(0,0),
|
CVector2f Position = CVector2f(0,0),
|
||||||
|
|
|
@ -33,7 +33,7 @@ class CTexture : public CResource
|
||||||
public:
|
public:
|
||||||
explicit CTexture(CResourceEntry *pEntry = nullptr);
|
explicit CTexture(CResourceEntry *pEntry = nullptr);
|
||||||
CTexture(uint32 Width, uint32 Height);
|
CTexture(uint32 Width, uint32 Height);
|
||||||
~CTexture();
|
~CTexture() override;
|
||||||
|
|
||||||
bool BufferGL();
|
bool BufferGL();
|
||||||
void Bind(uint32 GLTextureUnit);
|
void Bind(uint32 GLTextureUnit);
|
||||||
|
|
|
@ -89,7 +89,7 @@ class CWorld : public CResource
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CWorld(CResourceEntry *pEntry = nullptr);
|
explicit CWorld(CResourceEntry *pEntry = nullptr);
|
||||||
~CWorld();
|
~CWorld() override;
|
||||||
|
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
||||||
void SetAreaLayerInfo(CGameArea *pArea);
|
void SetAreaLayerInfo(CGameArea *pArea);
|
||||||
|
|
|
@ -15,7 +15,7 @@ class CCollisionMeshGroup : public CResource
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CCollisionMeshGroup(CResourceEntry *pEntry = nullptr) : CResource(pEntry) {}
|
explicit CCollisionMeshGroup(CResourceEntry *pEntry = nullptr) : CResource(pEntry) {}
|
||||||
~CCollisionMeshGroup() = default;
|
~CCollisionMeshGroup() override = default;
|
||||||
|
|
||||||
size_t NumMeshes() const { return mMeshes.size(); }
|
size_t NumMeshes() const { return mMeshes.size(); }
|
||||||
CCollisionMesh* MeshByIndex(size_t Index) const { return mMeshes[Index].get(); }
|
CCollisionMesh* MeshByIndex(size_t Index) const { return mMeshes[Index].get(); }
|
||||||
|
|
|
@ -22,7 +22,7 @@ protected:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CBasicModel(CResourceEntry *pEntry = nullptr);
|
explicit CBasicModel(CResourceEntry *pEntry = nullptr);
|
||||||
~CBasicModel();
|
~CBasicModel() override;
|
||||||
|
|
||||||
size_t GetVertexCount() const;
|
size_t GetVertexCount() const;
|
||||||
size_t GetTriangleCount() const;
|
size_t GetTriangleCount() const;
|
||||||
|
|
|
@ -23,7 +23,7 @@ class CModel : public CBasicModel
|
||||||
public:
|
public:
|
||||||
explicit CModel(CResourceEntry *pEntry = nullptr);
|
explicit CModel(CResourceEntry *pEntry = nullptr);
|
||||||
CModel(CMaterialSet *pSet, bool OwnsMatSet);
|
CModel(CMaterialSet *pSet, bool OwnsMatSet);
|
||||||
~CModel();
|
~CModel() override;
|
||||||
|
|
||||||
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
|
||||||
void BufferGL();
|
void BufferGL();
|
||||||
|
|
|
@ -18,12 +18,12 @@ class CStaticModel : public CBasicModel
|
||||||
public:
|
public:
|
||||||
CStaticModel();
|
CStaticModel();
|
||||||
explicit CStaticModel(CMaterial *pMat);
|
explicit CStaticModel(CMaterial *pMat);
|
||||||
~CStaticModel();
|
~CStaticModel() override;
|
||||||
void AddSurface(SSurface *pSurface);
|
void AddSurface(SSurface *pSurface);
|
||||||
|
|
||||||
void BufferGL();
|
void BufferGL();
|
||||||
void GenerateMaterialShaders();
|
void GenerateMaterialShaders();
|
||||||
void ClearGLBuffer();
|
void ClearGLBuffer() override;
|
||||||
void Draw(FRenderOptions Options);
|
void Draw(FRenderOptions Options);
|
||||||
void DrawSurface(FRenderOptions Options, uint32 Surface);
|
void DrawSurface(FRenderOptions Options, uint32 Surface);
|
||||||
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::White());
|
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::White());
|
||||||
|
|
|
@ -9,7 +9,7 @@ class CRootNode : public CSceneNode
|
||||||
public:
|
public:
|
||||||
explicit CRootNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent = nullptr)
|
explicit CRootNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent = nullptr)
|
||||||
: CSceneNode(pScene, NodeID, pParent) {}
|
: CSceneNode(pScene, NodeID, pParent) {}
|
||||||
~CRootNode() = default;
|
~CRootNode() override = default;
|
||||||
|
|
||||||
ENodeType NodeType() override
|
ENodeType NodeType() override
|
||||||
{
|
{
|
||||||
|
|
|
@ -37,7 +37,7 @@ public:
|
||||||
TString LocatorName() const { return mLocatorName; }
|
TString LocatorName() const { return mLocatorName; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void CalculateTransform(CTransform4f& rOut) const;
|
void CalculateTransform(CTransform4f& rOut) const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CSCRIPTATTACHNODE_H
|
#endif // CSCRIPTATTACHNODE_H
|
||||||
|
|
|
@ -78,7 +78,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void SetDisplayAsset(CResource *pRes);
|
void SetDisplayAsset(CResource *pRes);
|
||||||
void CalculateTransform(CTransform4f& rOut) const;
|
void CalculateTransform(CTransform4f& rOut) const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CSCRIPTNODE_H
|
#endif // CSCRIPTNODE_H
|
||||||
|
|
|
@ -10,7 +10,7 @@ class CSandwormExtra : public CScriptExtra
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CSandwormExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent);
|
explicit CSandwormExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent);
|
||||||
void PropertyModified(IProperty* pProp);
|
void PropertyModified(IProperty* pProp) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CSANDWORMEXTRA_H
|
#endif // CSANDWORMEXTRA_H
|
||||||
|
|
|
@ -34,7 +34,7 @@ public:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~CScriptExtra() = default;
|
~CScriptExtra() override = default;
|
||||||
CScriptObject* Instance() const { return mpInstance; }
|
CScriptObject* Instance() const { return mpInstance; }
|
||||||
EGame Game() const { return mGame; }
|
EGame Game() const { return mGame; }
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public:
|
||||||
|
|
||||||
// Virtual CScriptExtra functions
|
// Virtual CScriptExtra functions
|
||||||
virtual void InstanceTransformed() {}
|
virtual void InstanceTransformed() {}
|
||||||
virtual void PropertyModified(IProperty* /*pProperty*/) {}
|
void PropertyModified(IProperty* /*pProperty*/) override {}
|
||||||
virtual void DisplayAssetChanged(CResource* /*pNewDisplayAsset*/) {}
|
virtual void DisplayAssetChanged(CResource* /*pNewDisplayAsset*/) {}
|
||||||
virtual void LinksModified() {}
|
virtual void LinksModified() {}
|
||||||
virtual bool ShouldDrawNormalAssets() { return true; }
|
virtual bool ShouldDrawNormalAssets() { return true; }
|
||||||
|
|
|
@ -21,7 +21,7 @@ class CWaypointExtra : public CScriptExtra
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit CWaypointExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pParent = nullptr);
|
explicit CWaypointExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pParent = nullptr);
|
||||||
~CWaypointExtra();
|
~CWaypointExtra() override;
|
||||||
void CheckColor();
|
void CheckColor();
|
||||||
void AddToSplinePath(CSplinePathExtra *pPath);
|
void AddToSplinePath(CSplinePathExtra *pPath);
|
||||||
void RemoveFromSplinePath(const CSplinePathExtra *pPath);
|
void RemoveFromSplinePath(const CSplinePathExtra *pPath);
|
||||||
|
@ -29,11 +29,11 @@ public:
|
||||||
bool IsPathLink(const CLink *pLink) const;
|
bool IsPathLink(const CLink *pLink) const;
|
||||||
void GetLinkedWaypoints(std::list<CWaypointExtra*>& rOut);
|
void GetLinkedWaypoints(std::list<CWaypointExtra*>& rOut);
|
||||||
|
|
||||||
void OnTransformed();
|
void OnTransformed() override;
|
||||||
void LinksModified();
|
void LinksModified() override;
|
||||||
void AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo);
|
void AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo) override;
|
||||||
void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo);
|
void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo) override;
|
||||||
CColor TevColor();
|
CColor TevColor() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // CWAYPOINTEXTRA_H
|
#endif // CWAYPOINTEXTRA_H
|
||||||
|
|
Loading…
Reference in New Issue