AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-18 01:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

General: Remove unnecessary inline specifiers and add overrides

Browse Source
This commit is contained in:
Lioncash
2020-06-11 14:10:22 -04:00
parent 2d76c5865a
commit 012da6fb6d
107 changed files with 885 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Core/Resource/Animation/CSkeleton.h
View File

@@ -14,12 +14,11 @@ class CBone;
struct SBoneTransformInfo
{
CVector3f Position;
CQuaternion Rotation;
CVector3f Scale;
CVector3f Position{CVector3f::skZero};
CQuaternion Rotation{CQuaternion::skIdentity};
CVector3f Scale{CVector3f::skOne};
SBoneTransformInfo()
: Position(CVector3f::skZero), Rotation(CQuaternion::skIdentity), Scale(CVector3f::skOne) {}
SBoneTransformInfo() = default;
};
class CSkeleton : public CResource
@@ -33,8 +32,8 @@ class CSkeleton : public CResource
static const float skSphereRadius;
public:
CSkeleton(CResourceEntry *pEntry = 0);
~CSkeleton();
explicit CSkeleton(CResourceEntry *pEntry = nullptr);
~CSkeleton() override;
void UpdateTransform(CBoneTransformData& rData, CAnimation *pAnim, float Time, bool AnchorRoot);
CBone* BoneByID(uint32 BoneID) const;
CBone* BoneByName(const TString& rkBoneName) const;
@@ -43,8 +42,8 @@ public:
void Draw(FRenderOptions Options, const CBoneTransformData *pkData);
std::pair<int32,float> RayIntersect(const CRay& rkRay, const CBoneTransformData& rkData);
inline uint32 NumBones() const { return mBones.size(); }
inline CBone* RootBone() const { return mpRootBone; }
uint32 NumBones() const { return mBones.size(); }
CBone* RootBone() const { return mpRootBone; }
};
class CBone

2
src/Core/Resource/Animation/CSkin.h
View File

@@ -23,7 +23,7 @@ class CSkin : public CResource
std::vector<SVertGroup> mVertGroups;
public:
CSkin(CResourceEntry *pEntry = 0) : CResource(pEntry) {}
explicit CSkin(CResourceEntry *pEntry = nullptr) : CResource(pEntry) {}
const SVertexWeights& WeightsForVertex(uint32 VertIdx)
{

4
src/Core/Resource/Animation/CSourceAnimData.h
View File

@@ -27,7 +27,7 @@ class CSourceAnimData : public CResource
IMetaTransition *mpDefaultTransition;
public:
CSourceAnimData(CResourceEntry *pEntry = 0)
explicit CSourceAnimData(CResourceEntry *pEntry = nullptr)
: CResource(pEntry)
, mpDefaultTransition(nullptr)
{}
@@ -43,7 +43,7 @@ public:
delete mpDefaultTransition;
}
CDependencyTree* BuildDependencyTree() const
CDependencyTree* BuildDependencyTree() const override
{
// SAND normally has dependencies from meta-transitions and events
// However, all of these can be character-specific. To simplify things, all SAND

43
src/Core/Resource/Animation/IMetaAnimation.h
View File

@@ -26,11 +26,11 @@ extern CMetaAnimFactory gMetaAnimFactory;
class CAnimPrimitive
{
TResPtr<CAnimation> mpAnim;
uint32 mID;
uint32 mID = 0;
TString mName;
public:
CAnimPrimitive() : mID(0) {}
CAnimPrimitive() = default;
CAnimPrimitive(const CAssetID& rkAnimAssetID, uint32 CharAnimID, const TString& rkAnimName)
: mID(CharAnimID), mName(rkAnimName)
@@ -45,8 +45,9 @@ public:
mName = rInput.ReadString();
}
inline bool operator==(const CAnimPrimitive& rkRight) const { return mID == rkRight.mID; }
inline bool operator< (const CAnimPrimitive& rkRight) const { return mID < rkRight.mID; }
bool operator==(const CAnimPrimitive& other) const { return mID == other.mID; }
bool operator!=(const CAnimPrimitive& other) const { return !operator==(other); }
bool operator< (const CAnimPrimitive& other) const { return mID < other.mID; }
// Accessors
CAnimation* Animation() const { return mpAnim; }
@@ -58,8 +59,8 @@ public:
class IMetaAnimation
{
public:
IMetaAnimation() {}
virtual ~IMetaAnimation() {}
IMetaAnimation() = default;
virtual ~IMetaAnimation() = default;
virtual EMetaAnimType Type() const = 0;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const = 0;
@@ -78,13 +79,13 @@ protected:
public:
CMetaAnimPlay(const CAnimPrimitive& rkPrimitive, float UnkA, uint32 UnkB);
CMetaAnimPlay(IInputStream& rInput, EGame Game);
virtual EMetaAnimType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
// Accessors
inline CAnimPrimitive Primitive() const { return mPrimitive; }
inline float UnknownA() const { return mUnknownA; }
inline uint32 UnknownB() const { return mUnknownB; }
CAnimPrimitive Primitive() const { return mPrimitive; }
float UnknownA() const { return mUnknownA; }
uint32 UnknownB() const { return mUnknownB; }
};
// CMetaAnimBlend - blend between two animations
@@ -100,14 +101,14 @@ protected:
public:
CMetaAnimBlend(EMetaAnimType Type, IInputStream& rInput, EGame Game);
~CMetaAnimBlend();
virtual EMetaAnimType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
// Accessors
inline IMetaAnimation* BlendAnimationA() const { return mpMetaAnimA; }
inline IMetaAnimation* BlendAnimationB() const { return mpMetaAnimB; }
inline float UnknownA() const { return mUnknownA; }
inline bool UnknownB() const { return mUnknownB; }
IMetaAnimation* BlendAnimationA() const { return mpMetaAnimA; }
IMetaAnimation* BlendAnimationB() const { return mpMetaAnimB; }
float UnknownA() const { return mUnknownA; }
bool UnknownB() const { return mUnknownB; }
};
// SAnimProbabilityPair - structure used by CMetaAnimationRandom to associate an animation with a probability value
@@ -126,8 +127,8 @@ protected:
public:
CMetaAnimRandom(IInputStream& rInput, EGame Game);
~CMetaAnimRandom();
virtual EMetaAnimType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
// CMetaAnim - play a series of animations in sequence
@@ -139,8 +140,8 @@ protected:
public:
CMetaAnimSequence(IInputStream& rInput, EGame Game);
~CMetaAnimSequence();
virtual EMetaAnimType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaAnimType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
#endif // IMETAANIMATION

20
src/Core/Resource/Animation/IMetaTransition.h
View File

@@ -27,8 +27,8 @@ extern CMetaTransFactory gMetaTransFactory;
class IMetaTransition
{
public:
IMetaTransition() {}
virtual ~IMetaTransition() {}
IMetaTransition() = default;
virtual ~IMetaTransition() = default;
virtual EMetaTransType Type() const = 0;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const = 0;
};
@@ -41,8 +41,8 @@ class CMetaTransMetaAnim : public IMetaTransition
public:
CMetaTransMetaAnim(IInputStream& rInput, EGame Game);
~CMetaTransMetaAnim();
virtual EMetaTransType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaTransType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
// CMetaTransTrans
@@ -57,8 +57,8 @@ class CMetaTransTrans : public IMetaTransition
public:
CMetaTransTrans(EMetaTransType Type, IInputStream& rInput, EGame Game);
virtual EMetaTransType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaTransType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
// CMetaTransSnap
@@ -66,8 +66,8 @@ class CMetaTransSnap : public IMetaTransition
{
public:
CMetaTransSnap(IInputStream& rInput, EGame Game);
virtual EMetaTransType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaTransType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
// CMetaTransType4
@@ -75,8 +75,8 @@ class CMetaTransType4 : public IMetaTransition
{
public:
CMetaTransType4(IInputStream& rInput, EGame Game);
virtual EMetaTransType Type() const;
virtual void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const;
EMetaTransType Type() const override;
void GetUniquePrimitives(std::set<CAnimPrimitive>& rPrimSet) const override;
};
#endif // IMETATRANSITION_H