General: Add missing override specifiers where applicable

This commit is contained in:
Lioncash
2020-06-22 02:15:41 -04:00
parent 46926ef4bf
commit 4b3af988ad
19 changed files with 29 additions and 29 deletions

View File

@@ -108,7 +108,7 @@ public:
: CResource(pEntry)
{}
~CAnimSet()
~CAnimSet() override
{
// For MP2, anim events need to be cleaned up manually
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>();

View File

@@ -33,7 +33,7 @@ public:
: CResource(pEntry)
{}
~CSourceAnimData() = default;
~CSourceAnimData() override = default;
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override
{

View File

@@ -100,7 +100,7 @@ protected:
public:
CMetaAnimBlend(EMetaAnimType Type, IInputStream& rInput, EGame Game);
~CMetaAnimBlend();
~CMetaAnimBlend() override;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
@@ -126,7 +126,7 @@ protected:
public:
CMetaAnimRandom(IInputStream& rInput, EGame Game);
~CMetaAnimRandom();
~CMetaAnimRandom() override;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
@@ -139,7 +139,7 @@ protected:
public:
CMetaAnimSequence(IInputStream& rInput, EGame Game);
~CMetaAnimSequence();
~CMetaAnimSequence() override;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};

View File

@@ -44,7 +44,7 @@ class CMetaTransMetaAnim : public IMetaTransition
public:
CMetaTransMetaAnim(IInputStream& rInput, EGame Game);
~CMetaTransMetaAnim();
~CMetaTransMetaAnim() override;
EMetaTransType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};

View File

@@ -68,7 +68,7 @@ class CGameArea : public CResource
public:
explicit CGameArea(CResourceEntry *pEntry = nullptr);
~CGameArea();
~CGameArea() override;
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
void AddWorldModel(std::unique_ptr<CModel>&& pModel);

View File

@@ -45,7 +45,7 @@ public:
[&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>();

View File

@@ -62,7 +62,7 @@ class CFont : public CResource
public:
explicit CFont(CResourceEntry *pEntry = nullptr);
~CFont();
~CFont() override;
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
CVector2f RenderString(const TString& rkString, CRenderer *pRenderer, float AspectRatio,
CVector2f Position = CVector2f(0,0),

View File

@@ -33,7 +33,7 @@ class CTexture : public CResource
public:
explicit CTexture(CResourceEntry *pEntry = nullptr);
CTexture(uint32 Width, uint32 Height);
~CTexture();
~CTexture() override;
bool BufferGL();
void Bind(uint32 GLTextureUnit);

View File

@@ -89,7 +89,7 @@ class CWorld : public CResource
public:
explicit CWorld(CResourceEntry *pEntry = nullptr);
~CWorld();
~CWorld() override;
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
void SetAreaLayerInfo(CGameArea *pArea);

View File

@@ -15,7 +15,7 @@ class CCollisionMeshGroup : public CResource
public:
explicit CCollisionMeshGroup(CResourceEntry *pEntry = nullptr) : CResource(pEntry) {}
~CCollisionMeshGroup() = default;
~CCollisionMeshGroup() override = default;
size_t NumMeshes() const { return mMeshes.size(); }
CCollisionMesh* MeshByIndex(size_t Index) const { return mMeshes[Index].get(); }

View File

@@ -22,7 +22,7 @@ protected:
public:
explicit CBasicModel(CResourceEntry *pEntry = nullptr);
~CBasicModel();
~CBasicModel() override;
size_t GetVertexCount() const;
size_t GetTriangleCount() const;

View File

@@ -23,7 +23,7 @@ class CModel : public CBasicModel
public:
explicit CModel(CResourceEntry *pEntry = nullptr);
CModel(CMaterialSet *pSet, bool OwnsMatSet);
~CModel();
~CModel() override;
std::unique_ptr<CDependencyTree> BuildDependencyTree() const override;
void BufferGL();

View File

@@ -18,12 +18,12 @@ class CStaticModel : public CBasicModel
public:
CStaticModel();
explicit CStaticModel(CMaterial *pMat);
~CStaticModel();
~CStaticModel() override;
void AddSurface(SSurface *pSurface);
void BufferGL();
void GenerateMaterialShaders();
void ClearGLBuffer();
void ClearGLBuffer() override;
void Draw(FRenderOptions Options);
void DrawSurface(FRenderOptions Options, uint32 Surface);
void DrawWireframe(FRenderOptions Options, CColor WireColor = CColor::White());