mirror of https://github.com/AxioDL/metaforce.git
Follow 30-degree rule when exiting morph ball
This commit is contained in:
parent
718d2cb29e
commit
4a19b160b9
|
@ -1517,7 +1517,7 @@ void CBallCamera::UpdateTransitionFromBallCamera(CStateManager& mgr)
|
|||
deltaFlat.z = 0.f;
|
||||
if (deltaFlat.magnitude() > 0.001f)
|
||||
{
|
||||
SetTransform(zeus::lookAt(splinePoint, eyePos));
|
||||
SetTransform(zeus::lookAt(splinePoint, zeus::CVector3f::lerp(x1d8_lookPos, eyePos, morphFactor)));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -2006,7 +2006,7 @@ CFrontEndUI::CFrontEndUI()
|
|||
|
||||
m->ResetGameState();
|
||||
g_GameState->SetCurrentWorldId(g_ResFactory->TranslateOriginalToNew(g_DefaultWorldTag.id));
|
||||
g_GameState->CurrentWorldState().SetAreaId(7);
|
||||
g_GameState->CurrentWorldState().SetAreaId(0);
|
||||
g_GameState->GameOptions().ResetToDefaults();
|
||||
g_GameState->WriteBackupBuf();
|
||||
|
||||
|
|
2
specter
2
specter
|
@ -1 +1 @@
|
|||
Subproject commit 11cd223c88e9f298104747f204e9d64e6749530a
|
||||
Subproject commit 7d36a59969777f72ccc45b446b2637f88a33e6ac
|
Loading…
Reference in New Issue