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

I'm dumb, it is `std::min'

This commit is contained in:
Phillip Stephens 2021-06-02 22:10:13 -07:00
parent 8c2832d13e
commit 95c944563b
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CMorphBall.cpp
View File

@ -695,7 +695,7 @@ void CMorphBall::ApplySpiderBallRollForces(const CFinalInput& input, CStateManag
x18f8_spiderSurfacePivotTargetAngle = angle; x18f8_spiderSurfacePivotTargetAngle = angle;
} }
const float minAngle = const float minAngle =
std::max(std::fabs(x18f8_spiderSurfacePivotTargetAngle - x18f4_spiderSurfacePivotAngle), 0.2f); std::min(std::fabs(x18f8_spiderSurfacePivotTargetAngle - x18f4_spiderSurfacePivotAngle), 0.2f);
x18f4_spiderSurfacePivotAngle = minAngle * 1.f + x18f4_spiderSurfacePivotAngle; x18f4_spiderSurfacePivotAngle = minAngle * 1.f + x18f4_spiderSurfacePivotAngle;
x189c_spiderInterpBetweenPoints = x189c_spiderInterpBetweenPoints =
x18c4_spiderSurfaceTransform.rotate(zeus::CTransform::RotateY(x18f4_spiderSurfacePivotAngle).basis[2]); x18c4_spiderSurfaceTransform.rotate(zeus::CTransform::RotateY(x18f4_spiderSurfacePivotAngle).basis[2]);