griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Replaces virtual by override for CModelAbstract and derived classes.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D5137
This was SVN commit r27854.
This commit is contained in:
Vladislav Belov 2023-09-23 19:53:52 +00:00
parent f810418cb6
commit a2fbfe1ecd
5 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/graphics/Decal.h
View File

@ -56,19 +56,19 @@ public:
}
/// Dynamic cast
virtual CModelDecal* ToCModelDecal()
CModelDecal* ToCModelDecal() override
{
return this;
}
virtual std::unique_ptr<CModelAbstract> Clone() const;
std::unique_ptr<CModelAbstract> Clone() const override;
virtual void SetTerrainDirty(ssize_t i0, ssize_t j0, ssize_t i1, ssize_t j1);
void SetTerrainDirty(ssize_t i0, ssize_t j0, ssize_t i1, ssize_t j1) override;
virtual void CalcBounds();
virtual void ValidatePosition();
virtual void InvalidatePosition();
virtual void SetTransform(const CMatrix3D& transform);
void CalcBounds() override;
void ValidatePosition() override;
void InvalidatePosition() override;
void SetTransform(const CMatrix3D& transform) override;
// remove shadow receiving
void RemoveShadows();

29
source/graphics/Model.h
View File

@ -73,10 +73,10 @@ public:
public:
CModel(const CSimulation2& simulation, const CMaterial& material, const CModelDefPtr& modeldef);
~CModel();
~CModel() override;
/// Dynamic cast
virtual CModel* ToCModel()
CModel* ToCModel() override
{
return this;
}
@ -88,9 +88,9 @@ public:
const CModelDefPtr& GetModelDef() { return m_pModelDef; }
// set the model's player ID, recursively through props
void SetPlayerID(player_id_t id);
void SetPlayerID(player_id_t id) override;
// set the models mod color
virtual void SetShadingColor(const CColor& color);
void SetShadingColor(const CColor& color) override;
// get the model's material
const CMaterial& GetMaterial() { return m_Material; }
@ -115,13 +115,13 @@ public:
// TODO: replace with more generic shader define + flags setting
void RemoveShadowsRec();
virtual void SetTerrainDirty(ssize_t i0, ssize_t j0, ssize_t i1, ssize_t j1)
void SetTerrainDirty(ssize_t i0, ssize_t j0, ssize_t i1, ssize_t j1) override
{
for (size_t i = 0; i < m_Props.size(); ++i)
m_Props[i].m_Model->SetTerrainDirty(i0, j0, i1, j1);
}
virtual void SetEntityVariable(const std::string& name, float value)
void SetEntityVariable(const std::string& name, float value) override
{
for (size_t i = 0; i < m_Props.size(); ++i)
m_Props[i].m_Model->SetEntityVariable(name, value);
@ -131,7 +131,7 @@ public:
/// Overridden to calculate both the world-space and object-space bounds of this model, and stores the result in
/// m_Bounds and m_ObjectBounds, respectively.
virtual void CalcBounds();
void CalcBounds() override;
/// Returns the object-space bounds for this model, excluding its children.
const CBoundingBoxAligned& GetObjectBounds()
@ -140,7 +140,7 @@ public:
return m_ObjectBounds;
}
virtual const CBoundingBoxAligned GetWorldBoundsRec(); // reimplemented here
const CBoundingBoxAligned GetWorldBoundsRec() override; // reimplemented here
/// Auxiliary method; calculates object space bounds of this model, based solely on vertex positions, and stores
/// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcAnimatedObjectBounds) if it has been determined
@ -155,7 +155,7 @@ public:
// --- SELECTION BOX/BOUNDS ----------------------------------------------------------------------
/// Reimplemented here since proper models should participate in selection boxes.
virtual const CBoundingBoxAligned GetObjectSelectionBoundsRec();
const CBoundingBoxAligned GetObjectSelectionBoundsRec() override;
/**
* Set transform of this object.
@ -163,7 +163,7 @@ public:
* @note In order to ensure that all child props are updated properly,
* you must call ValidatePosition().
*/
virtual void SetTransform(const CMatrix3D& transform);
void SetTransform(const CMatrix3D& transform) override;
/**
* Return whether this is a skinned/skeletal model. If it is, Get*BoneMatrices()
@ -172,7 +172,8 @@ public:
bool IsSkinned() { return (m_BoneMatrices != NULL); }
// return the models bone matrices; 16-byte aligned for SSE reads
const CMatrix3D* GetAnimatedBoneMatrices() {
const CMatrix3D* GetAnimatedBoneMatrices()
{
ENSURE(m_PositionValid);
return m_BoneMatrices;
}
@ -208,19 +209,19 @@ public:
const std::vector<Prop>& GetProps() const { return m_Props; }
// return a clone of this model
virtual std::unique_ptr<CModelAbstract> Clone() const;
std::unique_ptr<CModelAbstract> Clone() const override;
/**
* Ensure that both the transformation and the bone
* matrices are correct for this model and all its props.
*/
virtual void ValidatePosition();
void ValidatePosition() override;
/**
* Mark this model's position and bone matrices,
* and all props' positions as invalid.
*/
virtual void InvalidatePosition();
void InvalidatePosition() override;
private:
// Needed for terrain aligned props

5
source/graphics/ModelAbstract.h
View File

@ -48,7 +48,8 @@ public:
*/
struct CustomSelectionShape
{
enum EType {
enum EType
{
/// The selection shape is determined by an oriented box of custom, user-specified size.
BOX,
/// The selection shape is determined by a cylinder of custom, user-specified size.
@ -68,7 +69,7 @@ public:
m_SelectionBoxValid(false), m_CustomSelectionShape(NULL)
{ }
~CModelAbstract()
virtual ~CModelAbstract()
{
delete m_CustomSelectionShape; // allocated and set externally by CCmpVisualActor, but our responsibility to clean up
}

14
source/graphics/ModelDummy.h
View File

@ -30,15 +30,15 @@ class CModelDummy final : public CModelAbstract
public:
CModelDummy() = default;
virtual ~CModelDummy() = default;
~CModelDummy() override = default;
virtual std::unique_ptr<CModelAbstract> Clone() const { return std::make_unique<CModelDummy>(); }
virtual CModelDummy* ToCModelDummy() { return this; }
std::unique_ptr<CModelAbstract> Clone() const override { return std::make_unique<CModelDummy>(); }
CModelDummy* ToCModelDummy() override { return this; }
virtual void CalcBounds() {}
virtual void SetTerrainDirty(ssize_t, ssize_t, ssize_t, ssize_t) {}
virtual void ValidatePosition() {}
virtual void InvalidatePosition() {}
void CalcBounds() override {}
void SetTerrainDirty(ssize_t, ssize_t, ssize_t, ssize_t) override {}
void ValidatePosition() override {}
void InvalidatePosition() override {}
};
#endif // INCLUDED_MODELDUMMY

18
source/graphics/ParticleEmitter.h
View File

@ -189,26 +189,26 @@ class CModelParticleEmitter : public CModelAbstract
{
public:
CModelParticleEmitter(const CParticleEmitterTypePtr& type);
~CModelParticleEmitter();
~CModelParticleEmitter() override;
/// Dynamic cast
virtual CModelParticleEmitter* ToCModelParticleEmitter()
CModelParticleEmitter* ToCModelParticleEmitter() override
{
return this;
}
virtual std::unique_ptr<CModelAbstract> Clone() const;
std::unique_ptr<CModelAbstract> Clone() const override;
virtual void SetTerrainDirty(ssize_t UNUSED(i0), ssize_t UNUSED(j0), ssize_t UNUSED(i1), ssize_t UNUSED(j1))
void SetTerrainDirty(ssize_t UNUSED(i0), ssize_t UNUSED(j0), ssize_t UNUSED(i1), ssize_t UNUSED(j1)) override
{
}
virtual void SetEntityVariable(const std::string& name, float value);
void SetEntityVariable(const std::string& name, float value) override;
virtual void CalcBounds();
virtual void ValidatePosition();
virtual void InvalidatePosition();
virtual void SetTransform(const CMatrix3D& transform);
void CalcBounds() override;
void ValidatePosition() override;
void InvalidatePosition() override;
void SetTransform(const CMatrix3D& transform) override;
CParticleEmitterTypePtr m_Type;
CParticleEmitterPtr m_Emitter;