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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CScriptVisorGoo.cpp
View File

@@ -71,9 +71,9 @@ void CScriptVisorGoo::Think(float, CStateManager& mgr) {
float t = (x108_maxDist - eyeToGooDist) / (x108_maxDist - x104_minDist);
if (mgr.GetActiveRandom()->Float() * 100.f <= (1.f - t) * x110_farProb + t * x10c_nearProb) {
mgr.AddObject(new CHUDBillboardEffect(
xfc_particleId.IsValid() ? xe8_particleDesc : rstl::optional<TToken<CGenDescription>>(),
xfc_particleId.IsValid() ? xe8_particleDesc : std::optional<TToken<CGenDescription>>(),
x100_electricId.IsValid() ? xf0_electricDesc
: rstl::optional<TToken<CElectricDescription>>(),
: std::optional<TToken<CElectricDescription>>(),
mgr.AllocateUniqueId(), true, "VisorGoo", CHUDBillboardEffect::GetNearClipDistance(mgr),
CHUDBillboardEffect::GetScaleForPOV(mgr), x114_color, zeus::skOne3f,
zeus::skZero3f));
@@ -109,7 +109,7 @@ void CScriptVisorGoo::Render(const CStateManager& mgr) const {
// Empty
}
rstl::optional<zeus::CAABox> CScriptVisorGoo::GetTouchBounds() const { return {}; }
std::optional<zeus::CAABox> CScriptVisorGoo::GetTouchBounds() const { return {}; }
void CScriptVisorGoo::Touch(CActor& other, CStateManager& mgr) {
// Empty