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

Fix CREKeyframeEmitter::GetValue

This commit is contained in:
Phillip Stephens 2022-10-17 22:40:25 -07:00
parent bb99d88d3b
commit 9ad66e9f2d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Kyoto/Particles/CRealElement.cpp
View File

@ -223,9 +223,7 @@ CRELifetimeTween::~CRELifetimeTween() {
}
// fake but using it to test
static inline float Lerp(float a, float b, float c) {
return b * c + a * (1.f - c);
}
static inline float Lerp(float a, float b, float c) { return b * c + a * (1.f - c); }
bool CRELifetimeTween::GetValue(int frame, float& valOut) const {
float ltFac = frame / CParticleGlobals::GetParticleLifetimeReal();
@ -264,15 +262,13 @@ bool CREKeyframeEmitter::GetValue(int frame, float& valOut) const {
return false;
}
int ltPerc = CParticleGlobals::GetParticleLifetimePercentage();
if (ltPerc == 100) {
valOut = x18_keys[ltPerc];
if (CParticleGlobals::GetParticleLifetimePercentage() == 100) {
valOut = x18_keys[CParticleGlobals::GetParticleLifetimePercentage()];
} else {
float ltPercRem = CParticleGlobals::GetParticleLifetimePercentageRemainder();
float key1 = x18_keys[ltPerc];
float key2 = x18_keys[ltPerc + 1];
valOut = (1.f - ltPercRem) * key1 + ltPercRem * key2;
// valOut = Lerp(key1, key2, ltPercRem);
valOut = (1.f - CParticleGlobals::GetParticleLifetimePercentageRemainder()) *
x18_keys[CParticleGlobals::GetParticleLifetimePercentage()] +
CParticleGlobals::GetParticleLifetimePercentageRemainder() *
x18_keys[CParticleGlobals::GetParticleLifetimePercentage() + 1];
}
return false;
}