PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-08 15:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor CActor/CModelData fixes, add matching CActor::UpdateAnimation

Browse Source
This commit is contained in:
Phillip Stephens
2022-08-14 22:50:25 -07:00
parent 09dfe946fc
commit 8e90988b5c
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/MetroidPrime/CActor.hpp
View File

@@ -246,8 +246,9 @@ public:
bool GetMuted() const { return xe5_26_muted; }
bool HasAnimation() const { return x64_modelData && x64_modelData->GetAnimationData(); }
bool HasModelData() const { return x64_modelData && (x64_modelData->GetAnimationData() || x64_modelData->HasNormalModel()); }
CModelData* GetModelData() const { return x64_modelData.get(); }
CAnimData* AnimationData() { return GetModelData()->GetAnimationData(); }
CModelData* ModelData() { return x64_modelData.get(); }
const CModelData* GetModelData() const { return x64_modelData.get(); }
CAnimData* AnimationData() { return ModelData()->AnimationData(); }
const CAnimData* GetAnimationData() const { return GetModelData()->GetAnimationData(); }
f32 GetAverageAnimVelocity(s32 anim);

5
include/MetroidPrime/CModelData.hpp
View File

@@ -41,7 +41,8 @@ public:
SAdvancementDeltas AdvanceAnimation(float dt, CStateManager& mgr, TAreaId aid, bool advTree);
void AdvanceParticles(const CTransform4f& xf, float dt, CStateManager& mgr);
CAnimData* GetAnimationData() const { return xc_animData.get(); }
const CAnimData* GetAnimationData() const { return xc_animData.get(); }
CAnimData* AnimationData() { return xc_animData.get(); }
CAABox GetBounds(const CTransform4f& xf) const;
CAABox GetBounds() const;
@@ -63,4 +64,4 @@ private:
rstl::optional_object< TCachedToken< CModel > > x3c_infraModel;
};
#endif
#endif