AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CScriptSteam: Fixes from decomp

This commit is contained in:
Luke Street 2023-10-17 23:21:00 -04:00
parent d29df977f3
commit e9cfa6aff4
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Runtime/World/CScriptSteam.cpp
View File

@ -17,14 +17,8 @@ CScriptSteam::CScriptSteam(TUniqueId uid, std::string_view name, const CEntityIn
, x158_(f1) , x158_(f1)
, x15c_alphaInDur(f2 / f1) , x15c_alphaInDur(f2 / f1)
, x160_alphaOutDur(f3 / f1) { , x160_alphaOutDur(f3 / f1) {
float r3 = (aabb.max.z() < aabb.max.y() ? aabb.max.z() : aabb.max.y()); float r3 = std::min(aabb.max.x(), std::min(aabb.max.y(), aabb.max.z()));
r3 = (r3 < aabb.max.x() ? r3 : aabb.max.x()); x164_ = zeus::close_enough(f4, 0.f) ? r3 : std::min(f4, r3);
if (zeus::close_enough(f4, 0.f)) {
r3 = (r3 < f2 ? r3 : f4);
}
x164_ = r3;
x168_ = 1.f / x164_; x168_ = 1.f / x164_;
} }
@ -32,7 +26,7 @@ void CScriptSteam::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptSteam::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CScriptSteam::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
if (msg == EScriptObjectMessage::Deactivate) { if (msg == EScriptObjectMessage::Deactivate) {
mgr.Player()->SetVisorSteam(0.f, x158_, x160_alphaOutDur, CAssetId(), x150_); mgr.Player()->SetVisorSteam(0.f, x158_, x160_alphaOutDur, CAssetId(), !x150_);
} }
CScriptTrigger::AcceptScriptMsg(msg, uid, mgr); CScriptTrigger::AcceptScriptMsg(msg, uid, mgr);
@ -50,12 +44,12 @@ void CScriptSteam::Think(float dt, CStateManager& mgr) {
const zeus::CVector3f posDiff = (GetTranslation() - eyePos); const zeus::CVector3f posDiff = (GetTranslation() - eyePos);
const float mag = posDiff.magnitude(); const float mag = posDiff.magnitude();
const float distance = (mag >= x164_ ? 0.f : std::cos((1.5707964f * mag) * x168_) * x158_); const float distance = (mag >= x164_ ? 0.f : std::cos((1.5707964f * mag) * x168_) * x158_);
mgr.Player()->SetVisorSteam(distance, x15c_alphaInDur, x160_alphaOutDur, x154_texture, x150_); mgr.Player()->SetVisorSteam(distance, x15c_alphaInDur, x160_alphaOutDur, x154_texture, !x150_);
if (x150_) { if (x150_) {
mgr.GetEnvFxManager()->SetSplashRate(2.f * distance); mgr.GetEnvFxManager()->SetSplashRate(2.f * distance);
} }
} else { } else {
mgr.Player()->SetVisorSteam(0.f, x15c_alphaInDur, x160_alphaOutDur, CAssetId(), x150_); mgr.Player()->SetVisorSteam(0.f, x15c_alphaInDur, x160_alphaOutDur, CAssetId(), !x150_);
} }
} }