From 6f53c6f3b7883efa5e322a08ddfdfca2a60b0c13 Mon Sep 17 00:00:00 2001 From: plattysoft Date: Sat, 24 May 2014 17:25:10 +0200 Subject: [PATCH] fixing a problem with infinite emiters --- LeonidasExamples/bin/classes.dex | Bin 21420 -> 21428 bytes LeonidasExamples/bin/resources.ap_ | Bin 14397 -> 14397 bytes .../plattysoft/leonids/ParticleSystem.java | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LeonidasExamples/bin/classes.dex b/LeonidasExamples/bin/classes.dex index eaf3d8aa31200c7acbab6f6529a716b5500014e8..b3c2997e310b86fe0bee35f858a2a93d0c286ffb 100644 GIT binary patch delta 7506 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 IfeNYr3nSu~`2YX_ delta 7646 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 diff --git a/LeonidasExamples/bin/resources.ap_ b/LeonidasExamples/bin/resources.ap_ index bfa9e940cc30ba8c94762ff40f112ba79e8d8e4f..0212f0b46050968313d215e84f756a162e4f52ce 100644 GIT binary patch delta 82 zcmdm6u(yCWz?+#xgn@~HgF(S_$41_RjLblK^F>Be2!oTkk{K-0$~ILW#F#8=76qoO R%>2Rh88bVu0$y_iMgZE|7>WP@ delta 82 zcmdm6u(yCWz?+#xgn@~HgW-4c_Kmy;8JU6f=8KG`5C$i6B{Nv0m2Ij%h%s5#EDB6l RnfZh1GiG*R1-#}4i~t#JAu0d> diff --git a/LeonidasLib/src/com/plattysoft/leonids/ParticleSystem.java b/LeonidasLib/src/com/plattysoft/leonids/ParticleSystem.java index 249b2e5..86cb48a 100644 --- 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); }