Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6102 from Atlante45/master

Browse source 
Fix particle bug by having lifetimes increase
This commit is contained in:
Brad Hefta-Gaub 2015-10-17 12:21:47 -07:00
commit 4289d54bd9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/entities/src/ParticleEffectEntityItem.cpp
View file

@ -644,14 +644,13 @@ void ParticleEffectEntityItem::stepSimulation(float deltaTime) {
// update particles between head and tail
for (quint32 i = _particleHeadIndex; i != _particleTailIndex; i = (i + 1) % _maxParticles) {
_particleLifetimes[i] -= deltaTime;
_particleLifetimes[i] += deltaTime;
// if particle has died.
if (_particleLifetimes[i] <= 0.0f || _lifespan == 0.0f) {
if (_particleLifetimes[i] >= _lifespan || _lifespan < EPSILON) {
// move head forward
_particleHeadIndex = (_particleHeadIndex + 1) % _maxParticles;
}
else {
} else {
float age = 1.0f - _particleLifetimes[i] / _lifespan; // 0.0 .. 1.0
updateRadius(i, age);
updateColor(i, age);
@ -672,7 +671,7 @@ void ParticleEffectEntityItem::stepSimulation(float deltaTime) {
// emit a new particle at tail index.
quint32 i = _particleTailIndex;
_particleLifetimes[i] = _lifespan;
_particleLifetimes[i] = 0.0f;
// Radius
if (_radiusSpread == 0.0f) {