AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CAnimData: Rename IceModel() to GetIceModel() 

Allows const overloading to work and prevents compilation errors from
occuring if the const qualifier on an instance changes over refactoring.
This commit is contained in:
Lioncash 2020-03-31 01:25:57 -04:00
parent 3e4731bf7f
commit 260dbaca7d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Character/CAnimData.hpp
View File

@ -251,7 +251,7 @@ public:
s32 GetCharacterIndex() const { return x204_charIdx; } s32 GetCharacterIndex() const { return x204_charIdx; }
u16 GetDefaultAnimation() const { return x208_defaultAnim; } u16 GetDefaultAnimation() const { return x208_defaultAnim; }
TLockedToken<CMorphableSkinnedModel>& IceModel() { return xe4_iceModelData; } TLockedToken<CMorphableSkinnedModel>& GetIceModel() { return xe4_iceModelData; }
const TLockedToken<CMorphableSkinnedModel>& GetIceModel() const { return xe4_iceModelData; } const TLockedToken<CMorphableSkinnedModel>& GetIceModel() const { return xe4_iceModelData; }
void SetParticleLightIdx(s32 idx) { x21c_particleLightIdx = idx; } void SetParticleLightIdx(s32 idx) { x21c_particleLightIdx = idx; }

2
Runtime/World/CPatterned.cpp
View File

@ -1586,7 +1586,7 @@ void CPatterned::RenderIceModelWithFlags(const CModelFlags& flags) const {
CModelFlags useFlags = flags; CModelFlags useFlags = flags;
useFlags.x1_matSetIdx = 0; useFlags.x1_matSetIdx = 0;
CAnimData* animData = x64_modelData->GetAnimationData(); CAnimData* animData = x64_modelData->GetAnimationData();
if (CMorphableSkinnedModel* iceModel = animData->IceModel().GetObj()) if (CMorphableSkinnedModel* iceModel = animData->GetIceModel().GetObj())
animData->Render(*iceModel, useFlags, {*x510_vertexMorph}, iceModel->GetMorphMagnitudes()); animData->Render(*iceModel, useFlags, {*x510_vertexMorph}, iceModel->GetMorphMagnitudes());
} }