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

Merge remote-tracking branch 'origin/animationstate'

Browse Source 
# Conflicts:
#	Runtime/MP1/World/CFlyingPirate.cpp
#	Runtime/World/CScriptGunTurret.cpp
This commit is contained in:
Luke Street
2021-03-01 23:45:21 -05:00
parent 60656b5a5d 14c92e85ce
commit bb4bdfa1ee
26 changed files with 340 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CGunMotion.cpp
View File

@@ -22,19 +22,19 @@ bool CGunMotion::PlayPasAnim(SamusGun::EAnimationState state, CStateManager& mgr
bool loop = true;
switch (state) {
case SamusGun::EAnimationState::Wander: {
CPASAnimParmData parms((s32(state)));
CPASAnimParmData parms((pas::EAnimationState(state)));
auto anim = pas.FindBestAnimation(parms, *mgr.GetActiveRandom(), -1);
animId = anim.second;
break;
}
case SamusGun::EAnimationState::Idle: {
CPASAnimParmData parms(s32(state), CPASAnimParm::FromEnum(0));
CPASAnimParmData parms(pas::EAnimationState(state), CPASAnimParm::FromEnum(0));
auto anim = pas.FindBestAnimation(parms, *mgr.GetActiveRandom(), -1);
animId = anim.second;
break;
}
case SamusGun::EAnimationState::Struck: {
CPASAnimParmData parms(s32(state), CPASAnimParm::FromInt32(0), CPASAnimParm::FromReal32(angle),
CPASAnimParmData parms(pas::EAnimationState(state), CPASAnimParm::FromInt32(0), CPASAnimParm::FromReal32(angle),
CPASAnimParm::FromBool(bigStrike), CPASAnimParm::FromBool(false));
auto anim = pas.FindBestAnimation(parms, *mgr.GetActiveRandom(), -1);
animId = anim.second;