LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-14 01:20:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2016-06-21 16:07:32 +02:00
parent 57b70e2a7b debea1192b
commit 516c0cc21d
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/ParticleSystem.cpp
+3 -3
View File
@@ -437,6 +437,9 @@ void ParticleSystem::setEmissionRate(float rate)
if (rate < 0.0f)
throw love::Exception("Invalid emission rate");
emissionRate = rate;
// Prevent an explosion when dramatically increasing the rate
emitCounter = std::min(emitCounter, 1.0f/rate);
}
float ParticleSystem::getEmissionRate() const
@@ -912,9 +915,6 @@ void ParticleSystem::update(float dt)
addParticle(1.0f - (emitCounter - rate) / total);
emitCounter -= rate;
}
/*int particles = (int)(emissionRate * dt);
for (int i = 0; i != particles; i++)
add();*/
life -= dt;
if (lifetime != -1 && life < 0)