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

Windows build fixes and warning avoidance

Browse Source
This commit is contained in:
Jack Andersen
2018-05-24 20:39:38 -10:00
parent 3ceaa82035
commit 70b3404b7c
195 changed files with 428 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Runtime/Particle/CElementGen.cpp
View File

@@ -234,7 +234,7 @@ CElementGen::CElementGen(const TToken<CGenDescription>& gen,
size_t maxInsts = x26c_30_MBLR ? (m_maxMBSP * x90_MAXP) : x90_MAXP;
maxInsts = (maxInsts == 0 ? 256 : maxInsts);
CGraphicsCommitResources([&](boo::IGraphicsDataFactory::Context& ctx)
CGraphics::CommitResources([&](boo::IGraphicsDataFactory::Context& ctx)
{
if (!x26c_31_LINE)
{
@@ -248,7 +248,7 @@ CElementGen::CElementGen(const TToken<CGenDescription>& gen,
}
CElementGenShaders::BuildShaderDataBinding(ctx, *this);
return true;
});
} BooTrace);
}
CElementGen::~CElementGen()
@@ -382,6 +382,12 @@ void CElementGen::AccumulateBounds(zeus::CVector3f& pos, float size)
void CElementGen::UpdateAdvanceAccessParameters(u32 activeParticleCount, u32 particleFrame)
{
if (activeParticleCount >= x60_advValues.size())
{
CParticleGlobals::g_particleAccessParameters = nullptr;
return;
}
CGenDescription* desc = x1c_genDesc.GetObj();
std::array<float, 8>& arr = x60_advValues[activeParticleCount];
@@ -436,7 +442,10 @@ void CElementGen::UpdateExistingParticles()
x25c_activeParticleCount = 0;
CParticleGlobals::SetEmitterTime(x74_curFrame);
CParticleGlobals::g_particleAccessParameters = &x60_advValues[x25c_activeParticleCount];
if (x25c_activeParticleCount < x60_advValues.size())
CParticleGlobals::g_particleAccessParameters = &x60_advValues[x25c_activeParticleCount];
else
CParticleGlobals::g_particleAccessParameters = nullptr;
for (auto it = x30_particles.begin(); it != x30_particles.end();)
{
@@ -1030,13 +1039,17 @@ void CElementGen::RenderModels(const CActorLights* actorLights)
if (particle.x0_endFrame == -1)
{
++matrixIt;
if (x2c_orientType == EModelOrientationType::One)
++matrixIt;
continue;
}
CParticleGlobals::SetParticleLifetime(particle.x0_endFrame - particle.x28_startFrame);
int partFrame = x74_curFrame - particle.x28_startFrame - 1;
CParticleGlobals::UpdateParticleLifetimeTweenValues(partFrame);
CParticleGlobals::g_particleAccessParameters = &x60_advValues[i];
if (i < x60_advValues.size())
CParticleGlobals::g_particleAccessParameters = &x60_advValues[i];
else
CParticleGlobals::g_particleAccessParameters = nullptr;
CVectorElement* pmop = desc->x6c_x58_PMOP.get();
if (pmop)
pmop->GetValue(partFrame, pmopVec);
@@ -1154,7 +1167,8 @@ void CElementGen::RenderModels(const CActorLights* actorLights)
}
}
++matrixIt;
if (x2c_orientType == EModelOrientationType::One)
++matrixIt;
}
if (desc->x45_24_x31_26_PMUS)
@@ -1376,7 +1390,7 @@ void CElementGen::RenderParticles()
std::sort(sortItems.begin(), sortItems.end(),
[](const CParticleListItem& a, const CParticleListItem& b) -> bool
{return a.x4_viewPoint[1] >= b.x4_viewPoint[1];});
{return a.x4_viewPoint[1] > b.x4_viewPoint[1];});
}
bool moveRedToAlphaBuffer = false;