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

Fix command line args on macOS when passed via open, implement CScriptCameraPitchVolume

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-23 02:13:36 -08:00
parent afd852f1a4
commit a8f5efb6e5
12 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/World/CScriptCameraPitchVolume.cpp
View File

@@ -29,10 +29,17 @@ void CScriptCameraPitchVolume::Accept(IVisitor& visitor)
visitor.Visit(this);
}
void CScriptCameraPitchVolume::Think(float, CStateManager&)
void CScriptCameraPitchVolume::Think(float, CStateManager& mgr)
{
if (!x30_24_active)
return;
if (x13c_24_entered && !x13c_25_occupied)
Entered(mgr);
else if (!x13c_24_entered && x13c_25_occupied)
Exited(mgr);
x13c_24_entered = false;
}
rstl::optional_object<zeus::CAABox> CScriptCameraPitchVolume::GetTouchBounds() const
@@ -50,8 +57,7 @@ void CScriptCameraPitchVolume::Touch(CActor& act, CStateManager& mgr)
if (!plBox)
return;
zeus::COBBox plOBox = zeus::COBBox::FromAABox(plBox.value(), zeus::CTransform::Identity());
xe8_obbox;
x13c_24_entered = xe8_obbox.AABoxIntersectsBox(plBox.value());
}
const zeus::CVector3f& CScriptCameraPitchVolume::GetScale() const { return x12c_scale; }