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

CElementGen: ADV Parameter fixes

This commit is contained in:
Phillip Stephens 2021-03-16 23:33:05 -07:00
parent 0a3bcf3ab8
commit 087bd51693
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Runtime/Particle/CElementGen.cpp
View File

@ -153,7 +153,11 @@ CElementGen::CElementGen(TToken<CGenDescription> gen, EModelOrientationType orie
maxpElem->GetValue(x74_curFrame, x90_MAXP); maxpElem->GetValue(x74_curFrame, x90_MAXP);
} }
x30_particles.reserve(x90_MAXP); s32 count = std::min(256, x90_MAXP);
x30_particles.reserve(count);
if (x26d_28_enableADV) {
x60_advValues.resize(count);
}
if (x2c_orientType == EModelOrientationType::One) if (x2c_orientType == EModelOrientationType::One)
x50_parentMatrices.resize(x90_MAXP); x50_parentMatrices.resize(x90_MAXP);
@ -472,21 +476,27 @@ void CElementGen::UpdateExistingParticles() {
void CElementGen::CreateNewParticles(int count) { void CElementGen::CreateNewParticles(int count) {
CGenDescription* desc = x1c_genDesc.GetObj(); CGenDescription* desc = x1c_genDesc.GetObj();
if (!g_ParticleSystemInitialized) if (!g_ParticleSystemInitialized) {
Initialize(); Initialize();
if (!count || x30_particles.size() >= x90_MAXP) }
return;
if (count + x30_particles.size() > x90_MAXP) if (x30_particles.size() >= x90_MAXP) {
return;
}
if (count + x30_particles.size() > x90_MAXP) {
count = x90_MAXP - x30_particles.size(); count = x90_MAXP - x30_particles.size();
int newTotalCount = g_ParticleAliveCount + count; }
if (newTotalCount > 2560)
if (g_ParticleAliveCount + count > 2560) {
count = 2560 - g_ParticleAliveCount; count = 2560 - g_ParticleAliveCount;
}
CGlobalRandom gr(x27c_randState); CGlobalRandom gr(x27c_randState);
x30_particles.reserve(x90_MAXP); x30_particles.reserve(count + x90_MAXP);
if (x26d_28_enableADV && x60_advValues.empty()) if (x26d_28_enableADV && x60_advValues.capacity() < count + x30_particles.size()) {
x60_advValues.resize(x90_MAXP); x60_advValues.resize(std::min(int(x60_advValues.capacity() * 2), x90_MAXP));
}
CParticleGlobals::instance()->m_particleAccessParameters = nullptr; CParticleGlobals::instance()->m_particleAccessParameters = nullptr;