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

Move CParticleGlobals from the executable and onto the heap, minor fixes, update wiki link

Browse Source
This commit is contained in:
Phillip Stephens
2019-12-03 00:47:05 -08:00
parent 697a100bca
commit 34e78a2dd0
29 changed files with 162 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Particle/CParticleElectric.cpp
View File

@@ -163,9 +163,9 @@ void CParticleElectric::UpdateElectricalEffects() {
continue;
}
CParticleGlobals::SetParticleLifetime(elec.xc_endFrame - elec.x8_startFrame);
CParticleGlobals::instance()->SetParticleLifetime(elec.xc_endFrame - elec.x8_startFrame);
int frame = x28_currentFrame - elec.x8_startFrame;
CParticleGlobals::UpdateParticleLifetimeTweenValues(frame);
CParticleGlobals::instance()->UpdateParticleLifetimeTweenValues(frame);
if (x450_27_haveSSWH) {
CParticleSwoosh& swoosh = *x1e0_swooshGenerators[elec.x0_idx];
@@ -333,9 +333,9 @@ void CParticleElectric::CreateNewParticles(int count) {
x3e8_electricManagers.push_back(CParticleElectricManager(allocIdx, lifetime, x28_currentFrame));
CParticleElectricManager& elec = x3e8_electricManagers.back();
CParticleGlobals::SetParticleLifetime(elec.xc_endFrame - elec.x8_startFrame);
CParticleGlobals::instance()->SetParticleLifetime(elec.xc_endFrame - elec.x8_startFrame);
int frame = x28_currentFrame - elec.x8_startFrame;
CParticleGlobals::UpdateParticleLifetimeTweenValues(frame);
CParticleGlobals::instance()->UpdateParticleLifetimeTweenValues(frame);
CalculatePoints();
if (x450_27_haveSSWH) {
@@ -515,7 +515,7 @@ bool CParticleElectric::Update(double dt) {
}
while (evalTime < x30_curTime) {
CParticleGlobals::SetEmitterTime(x28_currentFrame);
CParticleGlobals::instance()->SetEmitterTime(x28_currentFrame);
UpdateElectricalEffects();
if (emitting)
AddElectricalEffects();