7 files changed, 71 insertions, 17 deletions

diff --git a/src/systems/.collision.js.swp b/src/systems/.collision.js.swp
new file mode 100644
index 0000000..40fcae8
--- /dev/null
+++ b/src/systems/.collision.js.swp
diff --git a/src/systems/.particle.js.swp b/src/systems/.particle.js.swp
new file mode 100644
index 0000000..ab5d138
--- /dev/null
+++ b/src/systems/.particle.js.swp
diff --git a/src/systems/.render.js.swp b/src/systems/.render.js.swp
new file mode 100644
index 0000000..741856a
--- /dev/null
+++ b/src/systems/.render.js.swp
diff --git a/src/systems/collision.js b/src/systems/collision.js
index 08a1d91..0070ee7 100644
--- a/src/systems/collision.js
+++ b/src/systems/collision.js
@@ -39,19 +39,11 @@ game.system.Collision = (entitiesGrid) => {
           entity.removeComponent("momentum");
         } else {
           entitiesToPush.map((e) => {
-//            const particles = game.createBorderParticles({
-//              colors: ["#16f7c9", "#0d6e5a", "#2fa18a", "#48cfb4", "#58877d", "#178054", "#2cdb92"],
-//              maxSpeed: 0.20,
-//              minRadius: 1,
-//              maxRadius: 3,
-//              minLife: 100,
-//              maxLife: 300,
-//              minAmount: 20,
-//              maxAmount: 50,
-//            });
-//            particles.addComponent(game.components.Position(e.components.position));
-//            particles.addComponent(game.components.Appearance({width: game.canvas.width / game.config.xDim, height: game.canvas.height / game.config.yDim}));
-//            game.entities[particles.id] = particles;
+            const pushedParticleSpawner = game.createBorderParticles();
+            pushedParticleSpawner.addComponent(game.components.Position(e.components.position));
+            pushedParticleSpawner.addComponent(game.components.Appearance({width: game.canvas.width / game.config.xDim, height: game.canvas.height / game.config.yDim}));
+            game.entities[pushedParticleSpawner.id] = pushedParticleSpawner;
+
             e.addComponent(game.components.Momentum({...momentum}))
           });
         }
diff --git a/src/systems/keyboardInput.js b/src/systems/keyboardInput.js
index 50afda1..80feeef 100644
--- a/src/systems/keyboardInput.js
+++ b/src/systems/keyboardInput.js
@@ -33,4 +33,4 @@ game.system.KeyboardInput = (undoSystem) => {
   };
   window.addEventListener("keydown", keyPress);
   return { keys, update };
-}
\ No newline at end of file
+}
diff --git a/src/systems/particle.js b/src/systems/particle.js
new file mode 100644
index 0000000..e58c0a0
--- /dev/null
+++ b/src/systems/particle.js
@@ -0,0 +1,57 @@
+game.system.Particle = () => {
+  "use strict"; 
+  const particleSpawners = {};
+  
+  const particleSpawner = ({colors, maxAmount, minAmount, minLife, maxLife, minRadius, maxRadius, maxSpeed, spawnFunction}) => {
+    return Array(randomInRange(minAmount, maxAmount)).fill(0).map(() => {
+      let particleSpec = {
+        x: Math.random(),
+        y: Math.random(),
+        dx: Math.random() * maxSpeed - maxSpeed / 2,
+        dy: Math.random() * maxSpeed - maxSpeed / 2,
+        radius: randomInRange(minRadius, maxRadius),
+        color: colors[randomInRange(0, colors.length-1)],
+        lifetime: randomInRange(minLife, maxLife),
+        elapsed: 0,
+      };
+      if (spawnFunction) {
+        particleSpec = {...particleSpec, ...spawnFunction(particleSpec)};
+      }
+      return particleSpec;
+    });
+  }
+
+  const update = (elapsedTime, entities, _changedIds) => {
+    for (let id in entities) {
+      const entity = entities[id];
+      if (entity.hasComponent("particles")) {
+        if (!particleSpawners[entity.id]) {
+          particleSpawners[entity.id] = particleSpawner(entity.components.particles.spec.spec);
+          entities[id].particleSprite = game.graphics.Sprite({
+            drawFunction: (elapsedTime, {x, y, width, height}, context) => {
+              let particleSpawner = particleSpawners[entity.id];
+              particleSpawner.map((particleSpec) => particleSpec.elapsed += elapsedTime);
+              particleSpawners[id] = particleSpawner.filter((particleSpec) => particleSpec.lifetime > particleSpec.elapsed);
+              particleSpawner = particleSpawners[id];
+              if (particleSpawner.length === 0) {
+                entities[id].removeComponent("alive");
+              }
+              particleSpawner.map((particleSpec) => {
+                const position = {x: (particleSpec.x * width) + x + particleSpec.dx * particleSpec.elapsed, y: (particleSpec.y * height) + y + particleSpec.dy * particleSpec.elapsed};
+                const fill = context.fillStyle;
+                context.fillStyle = particleSpec.color;
+                context.beginPath();
+                context.arc(position.x, position.y, particleSpec.radius, 0, 2 * Math.PI);
+                context.fill();
+                context.fillStyle = fill;
+              });
+            }
+          });
+        }
+      }
+    }
+    return new Set();
+  };
+
+  return { update };
+};
diff --git a/src/systems/render.js b/src/systems/render.js
index d3bacb8..adc8355 100644
--- a/src/systems/render.js
+++ b/src/systems/render.js
@@ -10,12 +10,17 @@ game.system.Render = (graphics) => {
     });
 
     sortedEntities.forEach((entity) => {
-      if (entity.hasComponent("position") && entity.hasComponent("appearance") && entity.hasComponent("sprite")) {
-        game.sprites[entity.components.sprite.spriteName].draw(elapsedTime, {...entity.components.position, ...entity.components.appearance});
+      if (entity.hasComponent("position") && entity.hasComponent("appearance")) {
+        const drawSpec = {...entity.components.position, ...entity.components.appearance};
+        if (entity.hasComponent("sprite")) {
+          game.sprites[entity.components.sprite.spriteName].draw(elapsedTime, drawSpec);
+        } else if (entity.hasComponent("particles")) {
+          entity.particleSprite.draw(elapsedTime, drawSpec); 
+        }
       }
     });
 
     return new Set();
   }
   return { update };
-};
\ No newline at end of file
+};