AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-16 08:45:53 +00:00
Code Issues Projects Releases Wiki Activity

CPlayer: Fix logic in ChooseTransitionToAnimation

Browse Source
This commit is contained in:
Luke Street 2020-06-07 14:12:51 -04:00
parent 932b5587a2
commit 73d6465095
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/World/CPlayer.cpp
View File

@ -177,6 +177,8 @@ constexpr std::array<u16, 24> skRightStepSounds{
SFXsam_b_wlkorg_01, SFXsam_b_wlkorg_01,
}; };
constexpr float RCP_2PI = 0.15915494;
constexpr std::array<std::pair<CPlayerState::EItemType, ControlMapper::ECommands>, 4> skVisorToItemMapping{{ constexpr std::array<std::pair<CPlayerState::EItemType, ControlMapper::ECommands>, 4> skVisorToItemMapping{{
{CPlayerState::EItemType::CombatVisor, ControlMapper::ECommands::NoVisor}, {CPlayerState::EItemType::CombatVisor, ControlMapper::ECommands::NoVisor},
{CPlayerState::EItemType::XRayVisor, ControlMapper::ECommands::XrayVisor}, {CPlayerState::EItemType::XRayVisor, ControlMapper::ECommands::XrayVisor},
@ -301,8 +303,14 @@ s32 CPlayer::ChooseTransitionToAnimation(float dt, CStateManager& mgr) const {
return 2; // B_readytoball_samus return 2; // B_readytoball_samus
} }
const zeus::CRelAngle velAng = std::atan2(localVelFlat.x(), localVelFlat.y()); float velAng = std::atan2(-localVelFlat.x(), localVelFlat.y());
const float velDeg = velAng.asDegrees(); constexpr float twoPi = zeus::degToRad(360.f);
if (velAng > twoPi) {
velAng = velAng - static_cast<int>(velAng * RCP_2PI) * twoPi;
} else if (velAng < 0.f) {
velAng = twoPi + (velAng - static_cast<int>(velAng * RCP_2PI) * twoPi);
}
const float velDeg = zeus::radToDeg(velAng);
if (velDeg >= 45.f && velDeg <= 315.f) { if (velDeg >= 45.f && velDeg <= 315.f) {
return 1; // B_readytostationarybackwards_samus return 1; // B_readytostationarybackwards_samus
} }
@ -312,7 +320,6 @@ s32 CPlayer::ChooseTransitionToAnimation(float dt, CStateManager& mgr) const {
} }
return 4; // B_runtoballfoward_samus return 4; // B_runtoballfoward_samus
} }
void CPlayer::TransitionToMorphBallState(float dt, CStateManager& mgr) { void CPlayer::TransitionToMorphBallState(float dt, CStateManager& mgr) {