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

Fix fixed position camera hint

This commit is contained in:
Jack Andersen 2018-07-09 08:08:44 -10:00
parent ef1f9d564c
commit 67197621a1
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Audio/CStreamAudioManager.cpp
View File

@ -3,7 +3,7 @@
#include "CDvdFile.hpp" #include "CDvdFile.hpp"
#include "CDvdRequest.hpp" #include "CDvdRequest.hpp"
#include "Audio/CAudioSys.hpp" #include "Audio/CAudioSys.hpp"
#include "amuse/DSPCodec.h" #include "amuse/DSPCodec.hpp"
#include <memory> #include <memory>
namespace urde namespace urde

1
Runtime/Camera/CBallCamera.cpp
View File

@ -2285,6 +2285,7 @@ void CBallCamera::UpdateLookAtPosition(float dt, CStateManager& mgr)
lookAtOffsetAhead = moveXf * lookAtOffsetAhead; lookAtOffsetAhead = moveXf * lookAtOffsetAhead;
zeus::CVector3f lookAtPosAhead = ballPos + lookAtOffsetAhead; zeus::CVector3f lookAtPosAhead = ballPos + lookAtOffsetAhead;
x1c0_lookPosAhead = lookAtPosAhead; x1c0_lookPosAhead = lookAtPosAhead;
x1cc_fixedLookPos = ballPos + zeus::CVector3f(0.f, 0.f, lookAtOffsetAhead.z);
zeus::CVector3f aheadToCurrentLookDelta = x1d8_lookPos - lookAtPosAhead; zeus::CVector3f aheadToCurrentLookDelta = x1d8_lookPos - lookAtPosAhead;
float aheadToCurrentLookMag = aheadToCurrentLookDelta.magnitude(); float aheadToCurrentLookMag = aheadToCurrentLookDelta.magnitude();
if (aheadToCurrentLookDelta.canBeNormalized()) if (aheadToCurrentLookDelta.canBeNormalized())

2
Runtime/Graphics/CMoviePlayer.cpp
View File

@ -3,7 +3,7 @@
#include "specter/View.hpp" #include "specter/View.hpp"
#include "CGraphics.hpp" #include "CGraphics.hpp"
#include "Audio/g721.h" #include "Audio/g721.h"
#include "amuse/DSPCodec.h" #include "amuse/DSPCodec.hpp"
#include "CDvdRequest.hpp" #include "CDvdRequest.hpp"
#include <turbojpeg.h> #include <turbojpeg.h>

2
Runtime/MP1/CFrontEndUI.cpp
View File

@ -2006,7 +2006,7 @@ CFrontEndUI::CFrontEndUI()
m->ResetGameState(); m->ResetGameState();
g_GameState->SetCurrentWorldId(g_ResFactory->TranslateOriginalToNew(g_DefaultWorldTag.id)); g_GameState->SetCurrentWorldId(g_ResFactory->TranslateOriginalToNew(g_DefaultWorldTag.id));
g_GameState->CurrentWorldState().SetAreaId(26); g_GameState->CurrentWorldState().SetAreaId(7);
g_GameState->GameOptions().ResetToDefaults(); g_GameState->GameOptions().ResetToDefaults();
g_GameState->WriteBackupBuf(); g_GameState->WriteBackupBuf();

2
amuse

@ -1 +1 @@
Subproject commit 1e8ce19b167c80706ed396d32d1cc573c2b2a7ee Subproject commit cdc720b8a7b7cade5f3ca22d98ee9c8aec16b8a8