PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-12 23:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Former-commit-id: 8e90988b5c
This commit is contained in:
Phillip Stephens
2022-08-14 22:50:25 -07:00
parent 94e27faee8
commit 9675db47b4
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);