youngest in back ability

rockbite · Dec 1, 2023 · 0a1100a · 0a1100a
1 parent 3852a43
commit 0a1100a
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
diff --git a/editor/src/com/talosvfx/talos/editor/wrappers/EmConfigModuleWrapper.java b/editor/src/com/talosvfx/talos/editor/wrappers/EmConfigModuleWrapper.java
@@ -34,6 +34,7 @@ public class EmConfigModuleWrapper extends ModuleWrapper<EmConfigModule> {
     CheckboxWithZoom continuousBox;
     CheckboxWithZoom alignedBox;
     CheckboxWithZoom immortalBox;
+    CheckboxWithZoom youngestInBackBox;
 
     boolean lockListeners = false;
 
@@ -47,6 +48,7 @@ protected void configureSlots() {
         continuousBox = new CheckboxWithZoom("continuous", VisUI.getSkin());
         alignedBox = new CheckboxWithZoom("aligned", VisUI.getSkin());
         immortalBox = new CheckboxWithZoom("immortal", VisUI.getSkin());
+        youngestInBackBox = new CheckboxWithZoom("youngestInBackBox", VisUI.getSkin());
 
         Table form = new Table();
 
@@ -61,6 +63,8 @@ protected void configureSlots() {
         form.add(alignedBox).left().padLeft(3);
         form.row();
         form.add(immortalBox).left().padLeft(3);
+        form.row();
+        form.add(youngestInBackBox).left().padLeft(3);
 
         contentWrapper.add(form).left();
         contentWrapper.add().expandX();
@@ -103,6 +107,12 @@ public void changed(ChangeEvent event, Actor actor) {
                 fromUIToData();
             }
         });
+        youngestInBackBox.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                fromUIToData();
+            }
+        });
     }
 
     @Override
@@ -119,6 +129,8 @@ public void fromUIToData() {
             module.getUserValue().continuous = continuousBox.isChecked();
             module.getUserValue().aligned = alignedBox.isChecked();
             module.getUserValue().immortal = immortalBox.isChecked();
+            module.getUserValue().youngestInBack = youngestInBackBox.isChecked();
+
         }
     }
 
@@ -130,6 +142,7 @@ public void fromDataToUI() {
         continuousBox.setChecked(module.getUserValue().continuous);
         alignedBox.setChecked(module.getUserValue().aligned);
         immortalBox.setChecked(module.getUserValue().immortal);
+        youngestInBackBox.setChecked(module.getUserValue().youngestInBack);
         lockListeners = false;
     }
 

diff --git a/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/ParticleEmitterInstance.java b/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/ParticleEmitterInstance.java
@@ -142,6 +142,7 @@ public void update (float delta) {
 		isAdditive = emitterModule.isAdditive();
 		isBlendAdd = emitterModule.isBlendAdd();
 		isImmortal = emitterModule.isImmortal();
+		boolean youngestInBack = emitterModule.isYoungestInBack();
 
 		if (delayTimer > 0) {
 			delayTimer -= delta;
@@ -185,7 +186,11 @@ public void update (float delta) {
 					Particle particle = particlePool.obtain();
 					if (emitterGraph.getParticleModule() != null) {
 						particle.init(this);
-						activeParticles.add(particle);
+						if (youngestInBack) {
+							activeParticles.add(particle);
+						} else {
+							activeParticles.insert(0, particle);
+						}
 					}
 				}
 				particlesToEmmit -= count;

diff --git a/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/modules/EmConfigModule.java b/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/modules/EmConfigModule.java
@@ -39,6 +39,7 @@ public void init () {
         userValue.isBlendAdd = false;
         userValue.aligned = false;
         userValue.immortal = false;
+        userValue.youngestInBack = true;
     }
 
     @Override
@@ -65,6 +66,7 @@ public void write(Json json) {
         json.writeValue("continuous", getUserValue().continuous);
         json.writeValue("aligned", getUserValue().aligned);
         json.writeValue("immortal", getUserValue().immortal);
+        json.writeValue("youngestInFront", getUserValue().youngestInBack);
     }
 
     @Override
@@ -76,6 +78,7 @@ public void read (Json json, JsonValue jsonData) {
         getUserValue().continuous = jsonData.getBoolean("continuous");
         getUserValue().aligned = jsonData.getBoolean("aligned");
         getUserValue().immortal = jsonData.getBoolean("immortal", false);
+        getUserValue().youngestInBack = jsonData.getBoolean("youngestInFront", true);
 
         if(outputValue != null) {
             outputValue.set(getUserValue());

diff --git a/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/modules/EmitterModule.java b/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/modules/EmitterModule.java
@@ -127,6 +127,14 @@ public boolean isAdditive() {
         return config.additive;
     }
 
+    public boolean isYoungestInBack() {
+        fetchInputSlotValue(CONFIG);
+
+        if(config.isEmpty()) return true;
+
+        return config.youngestInBack;
+    }
+
 
     public boolean isBlendAdd () {
         fetchInputSlotValue(CONFIG);

diff --git a/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/values/EmConfigValue.java b/runtimes/talos/src/main/java/com/talosvfx/talos/runtime/vfx/values/EmConfigValue.java
@@ -24,6 +24,7 @@ public class EmConfigValue extends Value {
     public boolean additive = true;
     public boolean isBlendAdd = false;
     public boolean immortal = false;
+    public boolean youngestInBack = true;
 
     @Override
     public void set(Value value) {
@@ -37,5 +38,6 @@ public void set(EmConfigValue from) {
         this.additive = from.additive;
         this.isBlendAdd = from.isBlendAdd;
         this.immortal = from.immortal;
+        this.youngestInBack = from.youngestInBack;
     }
 }