Properly reset particles in the pool

rednblackgames · Feb 24, 2024 · 3677ced · 3677ced
1 parent 0bfc5d1
commit 3677ced
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/IEmitter.java b/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/IEmitter.java
@@ -27,6 +27,7 @@ public interface IEmitter {
     void pause();
     void resume();
     void restart();
+    void reset();
     float getDelayRemaining();
     void update(float delta);
     ParticleEmitterDescriptor getEmitterGraph();

diff --git a/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/ParticleEffectInstance.java b/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/ParticleEffectInstance.java
@@ -205,7 +205,13 @@ public void restart () {
 		totalTime = 0;
 	}
 
-
+	public void reset () {
+		for (int i = 0; i < emitters.size; i++) {
+			emitters.get(i).reset();
+		}
+		paused = false;
+		totalTime = 0;
+	}
 
 	public Array<IEmitter> getEmitters () {
         return emitters;

diff --git a/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/ParticleEffectInstancePool.java b/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/ParticleEffectInstancePool.java
@@ -45,7 +45,7 @@ public ParticleEffectDescriptor getParticleEffectDescriptor() {
     public void free(PooledParticleEffectInstance object) {
         super.free(object);
 
-        object.restart();
+        object.reset();
     }
 
     public class PooledParticleEffectInstance extends ParticleEffectInstance {

diff --git a/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/ParticleEmitterInstance.java b/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/ParticleEmitterInstance.java
@@ -353,4 +353,9 @@ public void setTint(float r, float g, float b, float a) {
 	public void setTint(Color color) {
     	tint.set(color);
 	}
+
+	public void reset() {
+		initialized = false;
+		activeParticles.clear();
+	}
 }
diff --git a/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/simulation/TinyEmitter.java b/runtimes/talos-libgdx/src/main/games/rednblack/talos/runtime/simulation/TinyEmitter.java
@@ -256,6 +256,11 @@ public void restart () {
         isStopped = false;
     }
 
+    @Override
+    public void reset() {
+
+    }
+
     @Override
     public boolean isStopped() {
         return isStopped;