AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:07:43 +00:00
Code Issues Projects Releases Wiki Activity

Various bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-23 22:23:28 -10:00
parent 41edf5a226
commit 6854cb9df7
36 changed files with 843 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Runtime/Camera/CCameraManager.cpp
View File

@@ -12,6 +12,7 @@
#include "World/CScriptCameraHint.hpp"
#include "CPathCamera.hpp"
#include "World/CScriptSpindleCamera.hpp"
#include "World/CExplosion.hpp"
namespace urde
{
@@ -80,7 +81,54 @@ int CCameraManager::AddCameraShaker(const CCameraShakeData& data, bool sfx)
return x2c_lastShakeId;
}
void CCameraManager::AddCinemaCamera(TUniqueId id, CStateManager& stateMgr) { x4_cineCameras.push_back(id); }
void CCameraManager::EnterCinematic(CStateManager& mgr)
{
mgr.GetPlayer().GetPlayerGun()->CancelFiring(mgr);
mgr.GetPlayer().Stop(mgr);
for (CEntity* ent : mgr.GetAllObjectList())
{
if (TCastToPtr<CExplosion> explo = ent)
{
mgr.FreeScriptObject(explo->GetUniqueId());
}
else if (TCastToPtr<CWeapon> weap = ent)
{
if (weap->GetActive())
{
if ((weap->GetAttribField() & CWeapon::EProjectileAttrib::KeepInCinematic) ==
CWeapon::EProjectileAttrib::None)
{
if (TCastToConstPtr<CAi>(mgr.GetObjectById(weap->GetOwnerId())) ||
TCastToConstPtr<CPlayer>(mgr.GetObjectById(weap->GetOwnerId())))
mgr.FreeScriptObject(weap->GetUniqueId());
}
}
}
}
}
void CCameraManager::AddCinemaCamera(TUniqueId id, CStateManager& stateMgr)
{
if (x4_cineCameras.empty())
EnterCinematic(stateMgr);
RemoveCinemaCamera(id, stateMgr);
x4_cineCameras.push_back(id);
if (TCastToPtr<CCinematicCamera> cam = stateMgr.ObjectById(id))
{
if (cam->GetFlags() & 0x4) // into player eye
{
float time = 4.f;
float delayTime = cam->GetDuration() - 4.f;
if (delayTime < 0.f)
{
delayTime = 0.f;
time = cam->GetDuration();
}
cam->SetFovInterpolation(cam->GetFov(), 55.f, time, delayTime);
}
}
}
void CCameraManager::SetInsideFluid(bool val, TUniqueId fluidId)
{