PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize CParticleGlobals static vars 

Former-commit-id: 97b330aa75
This commit is contained in:
Phillip Stephens 2023-01-14 02:42:15 -08:00
parent cf5562d509
commit a01c27ca3a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Kyoto/Particles/IElement.hpp
View File

@ -56,8 +56,8 @@ struct SUVElementSet {
float xMin, yMin, xMax, yMax; float xMin, yMin, xMax, yMax;
// SUVElementSet() : xMin(0.f), yMin(1.f), xMax(0.f), yMax(1.f) {} // SUVElementSet() : xMin(0.f), yMin(1.f), xMax(0.f), yMax(1.f) {}
// SUVElementSet(float xMin, float yMin, float xMax, float yMax) //SUVElementSet(float xMin, float yMin, float xMax, float yMax)
// : xMin(xMin), yMin(yMin), xMax(xMax), yMax(yMax) {} //: xMin(xMin), yMin(yMin), xMax(xMax), yMax(yMax) {}
// SUVElementSet(const SUVElementSet& other) // SUVElementSet(const SUVElementSet& other)
// : xMin(other.xMin), yMin(other.yMin), xMax(other.xMax), yMax(other.yMax) {} // : xMin(other.xMin), yMin(other.yMin), xMax(other.xMax), yMax(other.yMax) {}
}; };

20
src/Kyoto/Particles/CParticleGlobals.cpp
View File

@ -1,15 +1,15 @@
#include "Kyoto/Particles/CParticleGlobals.hpp" #include "Kyoto/Particles/CParticleGlobals.hpp"
int CParticleGlobals::mParticleLifetime; int CParticleGlobals::mParticleLifetime = 0.f;
float CParticleGlobals::mParticleLifetimeReal; float CParticleGlobals::mParticleLifetimeReal = 0.f;
int CParticleGlobals::mEmitterTime; int CParticleGlobals::mEmitterTime = 0;
float CParticleGlobals::mEmitterTimeReal; float CParticleGlobals::mEmitterTimeReal = 0.f;
int CParticleGlobals::mParticleLifetimePercentage; int CParticleGlobals::mParticleLifetimePercentage = 0;
float CParticleGlobals::mParticleLifetimePercentageReal; float CParticleGlobals::mParticleLifetimePercentageReal = 0.f;
float CParticleGlobals::mParticleLifetimePercentageRemainder; float CParticleGlobals::mParticleLifetimePercentageRemainder = 0.f;
CElementGen::CParticle* CParticleGlobals::mCurrentParticle; CElementGen::CParticle* CParticleGlobals::mCurrentParticle = nullptr;
float* CParticleGlobals::mParticleAccessParameters; float* CParticleGlobals::mParticleAccessParameters = nullptr;
CParticleGlobals::SParticleSystem* CParticleGlobals::mCurrentParticleSystem; CParticleGlobals::SParticleSystem* CParticleGlobals::mCurrentParticleSystem = nullptr;
void CParticleGlobals::SetParticleLifetime(int lifetime) { void CParticleGlobals::SetParticleLifetime(int lifetime) {
mParticleLifetime = lifetime; mParticleLifetime = lifetime;