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

Update submodules

This commit is contained in:
Phillip Stephens 2016-10-15 12:18:50 -07:00
parent 34380199ef
commit 8f91b453f3
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Camera/CCameraManager.cpp
View File

@ -134,8 +134,8 @@ const CGameCamera* CCameraManager::GetCurrentCamera(const CStateManager& stateMg
float CCameraManager::sub80009148() const float CCameraManager::sub80009148() const
{ {
const zeus::CVector3f uVec = x7c_fpCamera->GetTransform().upVector(); const zeus::CVector3f uVec = x7c_fpCamera->GetTransform().upVector();
return 1.f - std::min(std::fabs(std::min(std::fabs(uVec.y * uVec.x * uVec.z * zeus::kUpVec.y + zeus::kUpVec.x + return 1.f - std::min(std::fabs(std::min(std::fabs(uVec.dot(zeus::kUpVec)), 1.f) / std::cos(zeus::degToRad(30.f))),
zeus::kUpVec.z), 1.f) / std::cos(zeus::degToRad(30.f))), 1.f); 1.f);
} }
void CCameraManager::ResetCameras(CStateManager& mgr) void CCameraManager::ResetCameras(CStateManager& mgr)
@ -149,4 +149,10 @@ void CCameraManager::ResetCameras(CStateManager& mgr)
camObj->Reset(xf, mgr); camObj->Reset(xf, mgr);
} }
} }
void CCameraManager::SetSpecialCameras(CFirstPersonCamera& fp, CBallCamera& ball)
{
x7c_fpCamera = &fp;
x80_ballCamera = &ball;
}
} }

8
Runtime/Camera/CCameraManager.hpp
View File

@ -48,11 +48,7 @@ public:
static float DefaultThirdPersonFOV() {return 60.0f;} static float DefaultThirdPersonFOV() {return 60.0f;}
void ResetCameras(CStateManager& mgr); void ResetCameras(CStateManager& mgr);
void SetSpecialCameras(CFirstPersonCamera& fp, CBallCamera& ball) void SetSpecialCameras(CFirstPersonCamera& fp, CBallCamera& ball);
{
x7c_fpCamera = &fp;
x80_ballCamera = &ball;
}
bool IsInCinematicCamera() const {return x4_cineCameras.size() != 0;} bool IsInCinematicCamera() const {return x4_cineCameras.size() != 0;}
zeus::CVector3f GetGlobalCameraTranslation(const CStateManager& stateMgr) const; zeus::CVector3f GetGlobalCameraTranslation(const CStateManager& stateMgr) const;
zeus::CTransform GetCurrentCameraTransform(const CStateManager& stateMgr) const; zeus::CTransform GetCurrentCameraTransform(const CStateManager& stateMgr) const;
@ -73,6 +69,8 @@ public:
CFirstPersonCamera* GetFirstPersonCamera() { return x7c_fpCamera; } CFirstPersonCamera* GetFirstPersonCamera() { return x7c_fpCamera; }
CBallCamera* GetBallCamera() { return x80_ballCamera; } CBallCamera* GetBallCamera() { return x80_ballCamera; }
CBallCamera* BallCamera(CStateManager&) const;
CGameArea::CAreaFog Fog() { return x3c_fog; }
float sub80009148() const; float sub80009148() const;
}; };

2
hecl

@ -1 +1 @@
Subproject commit aacaa6dbb0c173b8a6e42e3825bc68d2db3d9a3b Subproject commit 164c8be0e0c13f0746687f6b36e9b6dd4086a2f1