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

CElementGen constructor

Browse Source
This commit is contained in:
Jack Andersen
2016-02-09 12:52:33 -10:00
parent 69f32a4706
commit 33eb00b366
14 changed files with 409 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Particle/CRealElement.cpp
View File

@@ -25,7 +25,7 @@ bool CREKeyframeEmitter::GetValue(int frame, float& valOut) const
{
if (!x4_percent)
{
int emitterTime = CParticleGlobals::g_emitterTimeInt;
int emitterTime = CParticleGlobals::g_EmitterTime;
int calcKey = emitterTime;
if (xc_loop)
{
@@ -47,8 +47,8 @@ bool CREKeyframeEmitter::GetValue(int frame, float& valOut) const
}
else
{
int ltPerc = CParticleGlobals::g_particleLifetimePercentTweenInt;
float ltPercRem = CParticleGlobals::g_particleLifetimePercentTweenIntFloatRem;
int ltPerc = CParticleGlobals::g_ParticleLifetimePercentage;
float ltPercRem = CParticleGlobals::g_ParticleLifetimePercentageRemainder;
if (ltPerc == 100)
valOut = x18_keys[100];
else
@@ -59,7 +59,7 @@ bool CREKeyframeEmitter::GetValue(int frame, float& valOut) const
bool CRELifetimeTween::GetValue(int frame, float& valOut) const
{
float ltFac = frame / CParticleGlobals::g_particleLifetimeFloat;
float ltFac = frame / CParticleGlobals::g_ParticleLifetimeReal;
float a, b;
x4_a->GetValue(frame, a);
x8_b->GetValue(frame, b);
@@ -149,7 +149,7 @@ bool CRELifetimePercent::GetValue(int frame, float& valOut) const
float a;
x4_percentVal->GetValue(frame, a);
a = std::max(0.0f, a);
valOut = (a / 100.0f) * CParticleGlobals::g_particleLifetimeFloat;
valOut = (a / 100.0f) * CParticleGlobals::g_ParticleLifetimeReal;
return false;
}