From 4a19b160b903b72e15ee65ba129245ab4a4e7a4e Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 21 Jun 2018 14:45:29 -1000 Subject: [PATCH] Follow 30-degree rule when exiting morph ball --- Runtime/Camera/CBallCamera.cpp | 2 +- Runtime/MP1/CFrontEndUI.cpp | 2 +- specter | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/Camera/CBallCamera.cpp b/Runtime/Camera/CBallCamera.cpp index 907237e64..16f143a7e 100644 --- a/Runtime/Camera/CBallCamera.cpp +++ b/Runtime/Camera/CBallCamera.cpp @@ -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 { diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp index 533fa6405..d68e0e8a0 100644 --- a/Runtime/MP1/CFrontEndUI.cpp +++ b/Runtime/MP1/CFrontEndUI.cpp @@ -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(); diff --git a/specter b/specter index 11cd223c8..7d36a5996 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 11cd223c88e9f298104747f204e9d64e6749530a +Subproject commit 7d36a59969777f72ccc45b446b2637f88a33e6ac