AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Additional CPlayer implementations

Browse Source
This commit is contained in:
Jack Andersen
2017-08-15 19:34:02 -10:00
parent 086ff76474
commit 8e8ce66799
26 changed files with 1684 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/Camera/CCameraManager.cpp
View File

@@ -241,7 +241,7 @@ void CCameraManager::ThinkCameras(float dt, CStateManager& mgr)
TUniqueId camId = GetLastCameraId();
const CGameCamera* cam = TCastToConstPtr<CGameCamera>(mgr.GetObjectById(camId));
if (cam)
if (cam != nullptr)
x3bc_curFov = cam->GetFov();
}
@@ -294,9 +294,9 @@ void CCameraManager::ProcessInput(const CFinalInput& input, CStateManager& state
{
for (CEntity* ent : stateMgr.GetCameraObjectList())
{
if (!ent)
if (ent == nullptr)
continue;
CGameCamera& cam = static_cast<CGameCamera&>(*ent);
auto& cam = static_cast<CGameCamera&>(*ent);
if (input.ControllerIdx() != cam.x16c_controllerIdx)
continue;
cam.ProcessInput(input, stateMgr);
@@ -318,4 +318,11 @@ void CCameraManager::LeaveBallCamera(CStateManager& mgr, TUniqueId newCamId)
{
}
float CCameraManager::GetCameraBobMagnitude() const
{
return 1.f - zeus::clamp(-1.f, zeus::clamp(-1.f,
x7c_fpCamera->GetTransform().basis[1].dot(zeus::CVector3f::skUp), 1.f) /
std::cos(2.f * M_PIF / 12.f), 1.f);
}
}