From 4a74b999cdd78edbded8b89642f37b76f048002f Mon Sep 17 00:00:00 2001
From: Tobias Nett <skaldarnar@googlemail.com>
Date: Sun, 29 Nov 2020 23:34:52 +0100
Subject: [PATCH] feat(campfire): add particle effects for campfire

---
 assets/prefabs/blocks/CampFire.prefab         |   3 +-
 assets/prefabs/particles/flames.prefab        |  27 +++++++++
 assets/prefabs/particles/smoke.prefab         |  27 +++++++++
 assets/textures/particles/fx_flame.png        | Bin 0 -> 491 bytes
 assets/textures/particles/fx_smoke.png        | Bin 0 -> 493 bytes
 .../particles/CampfireComponent.java          |  18 ++++++
 .../particles/CampfireParticleSystem.java     |  57 ++++++++++++++++++
 7 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 assets/prefabs/particles/flames.prefab
 create mode 100644 assets/prefabs/particles/smoke.prefab
 create mode 100644 assets/textures/particles/fx_flame.png
 create mode 100644 assets/textures/particles/fx_smoke.png
 create mode 100644 src/main/java/org/terasology/manualLabor/particles/CampfireComponent.java
 create mode 100644 src/main/java/org/terasology/manualLabor/particles/CampfireParticleSystem.java

diff --git a/assets/prefabs/blocks/CampFire.prefab b/assets/prefabs/blocks/CampFire.prefab
index 1083173..47316bb 100644
--- a/assets/prefabs/blocks/CampFire.prefab
+++ b/assets/prefabs/blocks/CampFire.prefab
@@ -9,5 +9,6 @@
     "paragraphText": [
       "The camp fire lights up a bigger area than just a torch."
     ]
-  }
+  },
+  "Campfire": {}
 }
diff --git a/assets/prefabs/particles/flames.prefab b/assets/prefabs/particles/flames.prefab
new file mode 100644
index 0000000..65774f5
--- /dev/null
+++ b/assets/prefabs/particles/flames.prefab
@@ -0,0 +1,27 @@
+{
+  "location": {},
+  "particleDataSprite": {
+    "texture": "ManualLabor:fx_flame"
+  },
+  "energyRangeGenerator": {
+    "minEnergy": 0.5,
+    "maxEnergy": 2
+  },
+  "scaleRangeGenerator": {
+    "minScale": [0.01, 0.01, 0.01],
+    "maxScale": [0.5, 0.5, 0.5]
+  },
+  "velocityRangeGenerator": {
+    "minVelocity": [0, 0.5, 0],
+    "maxVelocity": [0.4, 2, 0.4]
+  },
+  "velocityAffector": {},
+  "particleEmitter": {
+    "spawnRateMax": 20,
+    "spawnRateMin": 10,
+    "maxParticles": 100,
+    "particleCollision": false,
+    "destroyEntityWhenDead": true
+  },
+  "network": {}
+}
\ No newline at end of file
diff --git a/assets/prefabs/particles/smoke.prefab b/assets/prefabs/particles/smoke.prefab
new file mode 100644
index 0000000..c2faf01
--- /dev/null
+++ b/assets/prefabs/particles/smoke.prefab
@@ -0,0 +1,27 @@
+{
+  "location": {},
+  "particleDataSprite": {
+    "texture": "ManualLabor:fx_smoke"
+  },
+  "energyRangeGenerator": {
+    "minEnergy": 0.5,
+    "maxEnergy": 4
+  },
+  "scaleRangeGenerator": {
+    "minScale": [0.01, 0.01, 0.01],
+    "maxScale": [0.5, 0.5, 0.5]
+  },
+  "velocityRangeGenerator": {
+    "minVelocity": [0, 0.3, 0],
+    "maxVelocity": [0.4, 1, 0.4]
+  },
+  "velocityAffector": {},
+  "particleEmitter": {
+    "spawnRateMax": 20,
+    "spawnRateMin": 10,
+    "maxParticles": 100,
+    "particleCollision": false,
+    "destroyEntityWhenDead": true
+  },
+  "network": {}
+}
\ No newline at end of file
diff --git a/assets/textures/particles/fx_flame.png b/assets/textures/particles/fx_flame.png
new file mode 100644
index 0000000000000000000000000000000000000000..aab42dc2bc237e363c1d60eae2dbe4a8f34edeb4
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGI@yR6|68gGGZu6hvd$;36Srkkz8sufUJXy-G-H(9$3@L@j*{
z{Rg!Mtp!0)1Q8AW1$`|cxA&xAgr3W}?~mu4=jEK|fIXDc@@B^b<O?Mu5)62kV=G?g
zD=voV#SL-I)aSzC5N*fTJvLSE##OKO`&tfHGG%ID>k^*UbfY9ZD;(M=>56xR`?YL5
zDSRaCH{^iA*Gf;+`9*Q2&L4`6Xk;Gjs;4*ehZBET%Nlv%F=1amSJoQmQ8#g?3QLPp
z2W1Xn5+O(cFA2)5lcU7A)PiKz+Bfm*Tc9W&P5wF+3~^-0iq|h{S-PgArbSQ5m!qO`
z|DUIso|>$8cL$*J*|Oe8z_|;xs%3p2TUPA^98YjrX!?ti)6A#n)u!e<1kV<nUp2MF
z9$ak0z@r{F;=htZrahg8w=?L8LEkNOuhz3_taJJR(M@@x8`wX9QQ7ZV`vIW^XWox8
zWVZkS010qNS#tmY4`BcR4`BhQKc{H`001LNL_t(I%VS^|@_-SU^M4Y<f1)(yA@ng(
h>Vi=NMhzGy007qX0~FDyFB|{>002ovPDHLkV1m0N)h_@5

literal 0
HcmV?d00001

diff --git a/assets/textures/particles/fx_smoke.png b/assets/textures/particles/fx_smoke.png
new file mode 100644
index 0000000000000000000000000000000000000000..a55f60da0d47cdf27b0a62f2470fb7fc8fee4565
GIT binary patch
literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004QX+uL$X=7sm
z04R}lk-bYoQ5eR5YGI@yR6|68gGGZu6hvd$;36Srkkz8sufUJXy-G-H(9$3@L@j*{
z{Rg!Mtp!0)1Q8AW1$`|cxA&xAgr3W}?~mu4=jEK|fIXDc@@B^b<O?Mu5)62kV=G?g
zD=voV#SL-I)aSzC5N*fTJvLSE##OKO`&tfHGG%ID>k^*UbfY9ZD;(M=>56xR`?YL5
zDSRaCH{^iA*Gf;+`9*Q2&L4`6Xk;Gjs;4*ehZBET%Nlv%F=1amSJoQmQ8#g?3QLPp
z2W1Xn5+O(cFA2)5lcU7A)PiKz+Bfm*Tc9W&P5wF+3~^-0iq|h{S-PgArbSQ5m!qO`
z|DUIso|>$8cL$*J*|Oe8z_|;xs%3p2TUPA^98YjrX!?ti)6A#n)u!e<1kV<nUp2MF
z9$ak0z@r{F;=htZrahg8w=?L8LEkNOuhz3_taJJR(M@@x8`wX9QQ7ZV`vIW^XWox8
zWVZkS010qNS#tmY4`BcR4`BhQKc{H`001RPL_t(I%VS^|@_-SUbN1ws|HNoAHn)N6
jW1`drqXvu`FiZdd444EIv7WAu00000NkvXXu0mjfrvcZe

literal 0
HcmV?d00001

diff --git a/src/main/java/org/terasology/manualLabor/particles/CampfireComponent.java b/src/main/java/org/terasology/manualLabor/particles/CampfireComponent.java
new file mode 100644
index 0000000..a84593d
--- /dev/null
+++ b/src/main/java/org/terasology/manualLabor/particles/CampfireComponent.java
@@ -0,0 +1,18 @@
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+package org.terasology.manualLabor.particles;
+
+import org.terasology.entitySystem.Component;
+import org.terasology.entitySystem.Owns;
+import org.terasology.entitySystem.entity.EntityRef;
+
+public class CampfireComponent implements Component {
+    @Owns
+    EntityRef flameEmitter = EntityRef.NULL;
+    @Owns
+    EntityRef smokeEmitter = EntityRef.NULL;
+    @Owns
+    EntityRef lightEmitter = EntityRef.NULL;
+
+}
diff --git a/src/main/java/org/terasology/manualLabor/particles/CampfireParticleSystem.java b/src/main/java/org/terasology/manualLabor/particles/CampfireParticleSystem.java
new file mode 100644
index 0000000..52a6d7a
--- /dev/null
+++ b/src/main/java/org/terasology/manualLabor/particles/CampfireParticleSystem.java
@@ -0,0 +1,57 @@
+// Copyright 2020 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+package org.terasology.manualLabor.particles;
+
+import org.joml.Vector3f;
+import org.terasology.entitySystem.entity.EntityBuilder;
+import org.terasology.entitySystem.entity.EntityManager;
+import org.terasology.entitySystem.entity.EntityRef;
+import org.terasology.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
+import org.terasology.entitySystem.entity.lifecycleEvents.OnAddedComponent;
+import org.terasology.entitySystem.event.ReceiveEvent;
+import org.terasology.entitySystem.systems.BaseComponentSystem;
+import org.terasology.entitySystem.systems.RegisterMode;
+import org.terasology.entitySystem.systems.RegisterSystem;
+import org.terasology.logic.location.LocationComponent;
+import org.terasology.particles.components.ParticleEmitterComponent;
+import org.terasology.registry.In;
+import org.terasology.world.block.BlockComponent;
+
+@RegisterSystem(RegisterMode.ALWAYS)
+public class CampfireParticleSystem extends BaseComponentSystem {
+
+    @In
+    EntityManager entityManager;
+
+    @ReceiveEvent(components = {BlockComponent.class})
+    public void onActivate(OnAddedComponent event, EntityRef entity, LocationComponent location,
+                           CampfireComponent campfire) {
+        Vector3f loc = location.getWorldPosition(new Vector3f());
+        campfire.flameEmitter = createEmitter(entity, loc, "ManualLabor:flames");
+        loc.add(0, 1, 0);
+        campfire.smokeEmitter = createEmitter(entity, loc, "ManualLabor:smoke");
+        entity.saveComponent(campfire);
+    }
+
+    @ReceiveEvent
+    public void onDestroy(BeforeDeactivateComponent event, EntityRef entity, CampfireComponent campfire) {
+        campfire.smokeEmitter.destroy();
+        campfire.flameEmitter.destroy();
+        campfire.lightEmitter.destroy();
+    }
+
+    private EntityRef createEmitter(EntityRef entity, Vector3f location, String prefabName) {
+        EntityBuilder builder = entityManager.newBuilder(prefabName);
+        builder.updateComponent(LocationComponent.class, l -> {
+            l.setWorldPosition(new Vector3f(location));
+            return l;
+        });
+        builder.updateComponent(ParticleEmitterComponent.class, emitter -> {
+            emitter.ownerEntity = entity;
+            return emitter;
+        });
+        builder.setOwner(entity);
+        return builder.build();
+    }
+}