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

zeus constexpr refactor and thermal visor fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-02-23 21:15:54 -10:00
parent 1186b8097c
commit 8df0a4913c
226 changed files with 1339 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CScriptWater.cpp
View File

@@ -161,7 +161,7 @@ void CScriptWater::SetupGridClipping(CStateManager& mgr, int computeVerts) {
zeus::CVector3f pos = basePos;
pos.x() += xOffset;
pos.y() += yOffset;
x2dc_vertIntersects[i] = mgr.RayStaticIntersection(pos, zeus::CVector3f::skDown, mag, SolidFilter).IsValid();
x2dc_vertIntersects[i] = mgr.RayStaticIntersection(pos, zeus::skDown, mag, SolidFilter).IsValid();
gridDiv.rem += 1;
xOffset += x2c0_tileSize;
if (gridDiv.rem > x2c4_gridDimX) {
@@ -410,7 +410,7 @@ void CScriptWater::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum)
void CScriptWater::AddToRenderer(const zeus::CFrustum& /*frustum*/, const CStateManager& mgr) const {
if (!xe4_30_outOfFrustum) {
zeus::CPlane plane(zeus::CVector3f::skUp, x34_transform.origin.z() + x130_bounds.max.z());
zeus::CPlane plane(zeus::skUp, x34_transform.origin.z() + x130_bounds.max.z());
zeus::CAABox renderBounds = GetSortingBounds(mgr);
mgr.AddDrawableActorPlane(*this, plane, renderBounds);
}
@@ -438,9 +438,9 @@ void CScriptWater::Render(const CStateManager& mgr) const {
fogBox.max.z() += fogLevel;
zeus::CTransform modelXf =
zeus::CTransform::Translate(fogBox.center()) * zeus::CTransform::Scale((fogBox.max - fogBox.min) * 0.5f);
zeus::CAABox renderAABB(zeus::CVector3f::skNegOne, zeus::CVector3f::skOne);
zeus::CAABox renderAABB(zeus::skNegOne3f, zeus::skOne3f);
CGraphics::SetModelMatrix(modelXf);
g_Renderer->SetAmbientColor(zeus::CColor::skWhite);
g_Renderer->SetAmbientColor(zeus::skWhite);
g_Renderer->RenderFogVolume(x228_fogColor, renderAABB, nullptr, nullptr);
}
}