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

Merge remote-tracking branch 'origin/main' into dawn

This commit is contained in:
Luke Street 2022-02-22 21:09:14 -05:00
parent 648a8e1af5 a413a010b5
commit b2b03f1ace
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/World/CMorphBall.cpp
View File

@ -653,7 +653,7 @@ void CMorphBall::ApplySpiderBallRollForces(const CFinalInput& input, CStateManag
x18b4_linVelDamp = 0.4f; x18b4_linVelDamp = 0.4f;
x18b8_angVelDamp = 0.2f; x18b8_angVelDamp = 0.2f;
float viewControlMag = viewSurfaceForces.dot(x189c_spiderInterpBetweenPoints.normalized()); float viewControlMag = viewSurfaceForces.dot(x189c_spiderInterpBetweenPoints.normalized());
if (continueTrackForce && x1920_spiderForcesReset) { if (continueTrackForce && !x1920_spiderForcesReset) {
viewControlMag = x1918_spiderViewControlMag; viewControlMag = x1918_spiderViewControlMag;
} else { } else {
x1918_spiderViewControlMag = viewControlMag; x1918_spiderViewControlMag = viewControlMag;

2
Runtime/World/CScriptSpiderBallWaypoint.cpp
View File

@ -197,7 +197,7 @@ void CScriptSpiderBallWaypoint::GetClosestPointAlongWaypoints(CStateManager& mgr
closestPoint = lastPoint; closestPoint = lastPoint;
if (wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::Check) != kInvalidUniqueId) { if (wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::Check) != kInvalidUniqueId) {
wp = static_cast<const CScriptSpiderBallWaypoint*>( wp = static_cast<const CScriptSpiderBallWaypoint*>(
mgr.GetObjectById(wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::SkipCheck))); mgr.GetObjectById(wp->PreviousWaypoint(mgr, ECheckActiveWaypoint::Check)));
deltaBetweenPoints = lastPoint - wp->GetTranslation(); deltaBetweenPoints = lastPoint - wp->GetTranslation();
interpDeltaBetweenPoints = deltaBetweenPoints; interpDeltaBetweenPoints = deltaBetweenPoints;
} }