fixing a problem with infinite emiters

plattysoft · May 24, 2014 · 6f53c6f · 6f53c6f
1 parent 919dca3
commit 6f53c6f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/LeonidasExamples/bin/classes.dex b/LeonidasExamples/bin/classes.dex
diff --git a/LeonidasExamples/bin/resources.ap_ b/LeonidasExamples/bin/resources.ap_
diff --git a/LeonidasLib/src/com/plattysoft/leonids/ParticleSystem.java b/LeonidasLib/src/com/plattysoft/leonids/ParticleSystem.java
@@ -265,7 +265,9 @@ private void activateParticle(int delay) {
 	}
 
 	private void onUpdate(int miliseconds) {
-		while (mEmitingTime > 0 && miliseconds < mEmitingTime && !mParticles.isEmpty() && mActivatedParticles < mParticlesPerMilisecond*miliseconds) {
+		while (((mEmitingTime > 0 && miliseconds < mEmitingTime)|| mEmitingTime == -1) && // This point should emit
+				 !mParticles.isEmpty() && // We have particles in the pool 
+				 mActivatedParticles < mParticlesPerMilisecond*miliseconds) { // and we are under the number of particles that should be launched
 			// Activate a new particle
 			activateParticle(miliseconds);			
 		}