2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00

Water rendering order fix, morphball visor fixes

This commit is contained in:
Jack Andersen
2018-06-21 11:04:16 -10:00
parent cd3bba2f0e
commit 718d2cb29e
13 changed files with 40 additions and 32 deletions

View File

@@ -1268,7 +1268,9 @@ void CSamusHud::Update(float dt, const CStateManager& mgr,
default: break;
}
x500_viewportScale.y = 1.f - morphT * g_tweakGui->GetBallViewportYReduction();
float aspect = g_Viewport.x8_width / float(g_Viewport.xc_height);
float scaleMul = 1.f - zeus::clamp(0.f, (aspect - 1.33f) / (1.77f - 1.33f), 1.f);
x500_viewportScale.y = 1.f - scaleMul * morphT * g_tweakGui->GetBallViewportYReduction() * 1.2f;
if (x2b0_ballIntf)
x2b0_ballIntf->SetBallModeFactor(morphT);