AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 11:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Work on character animation

Browse Source
This commit is contained in:
Jack Andersen
2016-08-21 10:39:18 -10:00
parent d125b4769e
commit 670eb998d4
35 changed files with 460 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Character/CModelData.cpp
View File

@@ -240,10 +240,10 @@ SAdvancementDeltas CModelData::AdvanceAnimationIgnoreParticles(float dt, CRandom
return {};
}
SAdvancementDeltas CModelData::AdvanceAnimation(float dt, CStateManager& stateMgr, bool flag)
SAdvancementDeltas CModelData::AdvanceAnimation(float dt, CStateManager& stateMgr, TAreaId aid, bool flag)
{
if (x10_animData)
return x10_animData->Advance(dt, x0_particleScale, stateMgr, flag);
return x10_animData->Advance(dt, x0_particleScale, stateMgr, aid, flag);
else
return {};
}
@@ -292,13 +292,13 @@ void CModelData::RenderThermal(const zeus::CTransform& xf,
if (x10_animData)
{
const CSkinnedModel& model = PickAnimatedModel(EWhichModel::Thermal);
x10_animData->SetupRender(model, {}, nullptr);
CSkinnedModel& model = PickAnimatedModel(EWhichModel::Thermal);
x10_animData->SetupRender(model, drawFlags, {}, nullptr);
model.Draw(drawFlags);
}
else
{
const TLockedToken<CModel>& model = PickStaticModel(EWhichModel::Thermal);
TLockedToken<CModel>& model = PickStaticModel(EWhichModel::Thermal);
model->Draw(drawFlags);
}
}