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

Fixes for CElementGen / CExplosion

This commit is contained in:
Luke Street 2022-03-26 20:23:44 -04:00
parent e409f05b40
commit 2503872065
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Particle/CElementGen.cpp
View File

@ -1215,7 +1215,7 @@ void CElementGen::RenderParticles() {
} }
} }
bool hasModuColor = x338_moduColor != zeus::skBlack; // TODO skClear? bool hasModuColor = x338_moduColor != zeus::skWhite;
CGraphics::SetCullMode(ERglCullMode::None); CGraphics::SetCullMode(ERglCullMode::None);
zeus::CTransform systemModelMatrix(CGraphics::g_ViewMatrix); zeus::CTransform systemModelMatrix(CGraphics::g_ViewMatrix);
systemModelMatrix.origin.zeroOut(); systemModelMatrix.origin.zeroOut();

9
Runtime/World/CExplosion.cpp
View File

@ -50,9 +50,8 @@ void CExplosion::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CSt
} else if (msg == EScriptObjectMessage::Registered) { } else if (msg == EScriptObjectMessage::Registered) {
if (xe8_particleGen->SystemHasLight()) { if (xe8_particleGen->SystemHasLight()) {
xec_explosionLight = mgr.AllocateUniqueId(); xec_explosionLight = mgr.AllocateUniqueId();
mgr.AddObject(new CGameLight(xec_explosionLight, GetAreaIdAlways(), true, "ExplodePLight_" + x10_name, mgr.AddObject(new CGameLight(xec_explosionLight, GetAreaIdAlways(), GetActive(), "ExplodePLight_" + x10_name,
x34_transform, GetUniqueId(), xe8_particleGen->GetLight(), 1, /*xf0_particleDesc*/ 0, x34_transform, GetUniqueId(), xe8_particleGen->GetLight(), 1, 0, 0.f));
0.f));
} }
} }
@ -111,8 +110,8 @@ void CExplosion::Render(CStateManager& mgr) {
return; return;
} }
CElementGen::SetSubtractBlend(xf4_24_renderThermalHot); CElementGen::SetSubtractBlend(!xf4_24_renderThermalHot);
CGraphics::SetFog(ERglFogMode::PerspLin, 0.f, 74.f, zeus::skBlack); CGraphics::SetFog(ERglFogMode::PerspLin, 0.f, 75.f, zeus::skBlack);
xe8_particleGen->Render(); xe8_particleGen->Render();
mgr.SetupFogForArea(GetAreaIdAlways()); mgr.SetupFogForArea(GetAreaIdAlways());
CElementGen::SetSubtractBlend(false); CElementGen::SetSubtractBlend(false);