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

Finish CScriptActor

Browse Source
This commit is contained in:
Phillip Stephens
2017-02-12 16:00:07 -08:00
parent 6857e219b4
commit e062de1429
6 changed files with 103 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/Camera/CCameraManager.cpp
View File

@@ -33,13 +33,13 @@ CCameraManager::CCameraManager(TUniqueId curCameraId) : x0_curCameraId(curCamera
zeus::CVector3f CCameraManager::GetGlobalCameraTranslation(const CStateManager& stateMgr) const
{
const CGameCamera* camera = GetCurrentCamera(stateMgr);
TCastToConstPtr<CGameCamera> camera(GetCurrentCamera(stateMgr));
return camera->GetTransform() * x30_shakeOffset;
}
zeus::CTransform CCameraManager::GetCurrentCameraTransform(const CStateManager& stateMgr) const
{
const CGameCamera* camera = GetCurrentCamera(stateMgr);
TCastToConstPtr<CGameCamera> camera(GetCurrentCamera(stateMgr));
return camera->GetTransform() * zeus::CTransform::Translate(x30_shakeOffset);
}
@@ -141,16 +141,16 @@ void CCameraManager::Update(float dt, CStateManager& stateMgr)
#endif
}
CGameCamera* CCameraManager::GetCurrentCamera(CStateManager& stateMgr) const
CEntity* CCameraManager::GetCurrentCamera(CStateManager& stateMgr) const
{
CObjectList* camList = stateMgr.ObjectListById(EGameObjectList::GameCamera);
return TCastToPtr<CGameCamera>(camList->GetObjectById(GetCurrentCameraId())).GetPtr();
return camList->GetObjectById(GetCurrentCameraId());
}
const CGameCamera* CCameraManager::GetCurrentCamera(const CStateManager& stateMgr) const
const CEntity* CCameraManager::GetCurrentCamera(const CStateManager& stateMgr) const
{
const CObjectList* camList = stateMgr.GetObjectListById(EGameObjectList::GameCamera);
return static_cast<const CGameCamera*>(camList->GetObjectById(GetCurrentCameraId()));
return camList->GetObjectById(GetCurrentCameraId());
}
float CCameraManager::sub80009148() const