Browse Source

Fixed large burst of particles when dramatically increasing the emission rate of a ParticleSystem. (fixes #1169)

Bart van Strien 9 years ago
parent
commit
debea1192b
2 changed files with 4 additions and 3 deletions
  1. 1 0
      changes.txt
  2. 3 3
      src/modules/graphics/ParticleSystem.cpp

+ 1 - 0
changes.txt

@@ -18,6 +18,7 @@ Released: N/A
   * Fixed gamma correction of ImageFonts and BMFonts with colored images.
   * Fixed gamma correction of ImageFonts and BMFonts with colored images.
   * Fixed the default shader improperly applying gamma correction to per-vertex colors when gamma correction is requested but not supported on OpenGL ES.
   * Fixed the default shader improperly applying gamma correction to per-vertex colors when gamma correction is requested but not supported on OpenGL ES.
   * Fixed text coloring breaking because of an empty string.
   * Fixed text coloring breaking because of an empty string.
+  * Fixed large burst of particles when dramatically increasing the emission rate of a ParticleSystem.
 
 
   * Improved performance of Channel methods by roughly 2x in many cases.
   * Improved performance of Channel methods by roughly 2x in many cases.
   
   

+ 3 - 3
src/modules/graphics/ParticleSystem.cpp

@@ -437,6 +437,9 @@ void ParticleSystem::setEmissionRate(float rate)
 	if (rate < 0.0f)
 	if (rate < 0.0f)
 		throw love::Exception("Invalid emission rate");
 		throw love::Exception("Invalid emission rate");
 	emissionRate = rate;
 	emissionRate = rate;
+
+	// Prevent an explosion when dramatically increasing the rate
+	emitCounter = std::min(emitCounter, 1.0f/rate);
 }
 }
 
 
 float ParticleSystem::getEmissionRate() const
 float ParticleSystem::getEmissionRate() const
@@ -932,9 +935,6 @@ void ParticleSystem::update(float dt)
 			addParticle(1.0f - (emitCounter - rate) / total);
 			addParticle(1.0f - (emitCounter - rate) / total);
 			emitCounter -= rate;
 			emitCounter -= rate;
 		}
 		}
-		/*int particles = (int)(emissionRate * dt);
-		 for (int i = 0; i != particles; i++)
-		 add();*/
 
 
 		life -= dt;
 		life -= dt;
 		if (lifetime != -1 && life < 0)
 		if (lifetime != -1 && life < 0)