Added check to prevent particle starting in hazard.

js/animation1a.js

@@ -81,7 +81,7 @@ Animation1a.prototype.updateAnimating = function(isAnimating) {
 }
 
 Animation1a.prototype.updateCount = function(count) {
-    while (this.particles.length >= count) {
+    while (this.particles.length > count) {
         delete this.particles.pop().remove();
     }
 

js/animation1b.js

@@ -52,7 +52,7 @@ Animation1b.prototype.updateAnimating = function(isAnimating) {
 }
 
 Animation1b.prototype.updateCount = function(count) {
-    while (this.particles.length >= count) {
+    while (this.particles.length > count) {
         delete this.particles.pop().remove();
     }
 

js/animation2a.js

@@ -9,7 +9,7 @@ function Animation2a() {
         count: 1,
         maxCount: 10,
         randomize: true,
-        showMovementCircle: true,
+        showMovementCircle: false,
         showVisionGrid: true,
         speed: 4
     };
@@ -35,8 +35,8 @@ function Animation2a() {
     // TODO perf - cache trig or perform operations
     // TODO only randomize movement on 1a
 
-    // TODO ANIM2a Vision grid touches trig transform
     // TODO ANIM2a randomize hazards
+    // TODO can the vision grid be relative to the particle
     // TODO ANIM2 particle evade
     // TODO ANIM2b Scale vision grid to 1000 particles
 
@@ -68,7 +68,7 @@ Animation2a.prototype.updateAnimating = function(isAnimating) {
 }
 
 Animation2a.prototype.updateCount = function(count) {
-    while (this.particles.length >= count) {
+    while (this.particles.length > count) {
         delete this.particles.pop().remove();
     }
 

js/particle.js

@@ -27,16 +27,7 @@ function Particle(parent, bounds, config, globalGrid) {
         vision: createVisionGrid(this.config)
     };
 
-    this.arc = {
-        centerX: random.num(0, bounds.width),
-        centerY: random.num(0, bounds.height),
-        clockwise: random.bool(),
-        endX: 0,
-        endY: 0,
-        length: random.num(RAD.t90, RAD.t360),
-        radius: random.num(100, 200),
-        theta: random.num(RAD.t90, RAD.t360),
-    };
+    this.arc = createArc(bounds, globalGrid, this.config); // TODO no need to pass config after testing
 
     this.nodes = {
         body: createBodyNode(this.config),
@@ -57,6 +48,9 @@ function Particle(parent, bounds, config, globalGrid) {
 
 Particle.prototype.remove = function() {
     this.nodes.parent.removeChild(this.nodes.container);
+
+    this.nodes.visionGrid.forEach(node => this.nodes.parent.removeChild(node));
+
     return this;
 }
 
@@ -64,6 +58,8 @@ Particle.prototype.nextFrame = function() {
     this.arc = updateArc(this.arc, this.config);
     this.grids.vision = updateVisionGrid(this.arc, this.config, this.grids);
 
+    this.arc = evade(this.arc, this.grids.vision);
+
     repaintContainer(this.nodes.container, this.arc);
     repaintBody(this.nodes.body, this.arc);
     repaintCircle(this.nodes.circle, this.arc);
@@ -96,6 +92,34 @@ Particle.prototype.updateConfig = function(config) {
 
 // ===== CREATION =====
 
+function createArc(bounds, globalGrid, config) {
+    let arc = {
+        centerX: random.num(0, bounds.width),
+        centerY: random.num(0, bounds.height),
+        clockwise: random.bool(),
+        endX: 0,
+        endY: 0,
+        length: random.num(RAD.t90, RAD.t360),
+        radius: random.num(100, 200),
+        theta: random.num(RAD.t90, RAD.t360),
+    };
+
+    arc.endX = arc.centerX + arc.radius * Math.cos(arc.theta);
+    arc.endY = arc.centerY - arc.radius * Math.sin(arc.theta);
+
+    arc = overflowArc(arc, bounds);
+
+    const x = arc.endX - arc.endX % 5;
+    const y = arc.endY - arc.endY % 5;
+
+    // If starting in a hazard, recurse.
+    if (globalGrid[x] !== undefined && globalGrid[x][y] !== undefined) {
+        arc = createArc(bounds, globalGrid, config);
+    }
+
+    return arc;
+}
+
 function createBodyNode(config) {
     const node = document.createElement('div');
     node.className = 'particle-body';
@@ -121,10 +145,6 @@ function createContainerNode(config) {
 }
 
 function createVisionGrid(config) {
-    if (config.showVisionGrid === false) {
-        return [];
-    }
-
     const { gridSize: side, visionRadius: radius } = config;
     const r0 = radius;
     const r1 = radius - side;
@@ -133,8 +153,8 @@ function createVisionGrid(config) {
 
     for (let x = -radius; x <= radius; x += side) {
         for (let y = -radius; y <= radius; y += side) {
-            // Omit lower half
-            if (y < 0) {
+            // Omit large slices of unused circle
+            if (x > y || x < -y) {
                 continue;
             }
 
@@ -146,7 +166,7 @@ function createVisionGrid(config) {
 
             let alpha = Math.atan(y / x);
             if (x < 0) {
-                alpha = RAD.t180 + alpha; // TODO +=
+                alpha += RAD.t180;
             }
 
             points.push({ x, y, r, alpha, touch: false });
@@ -201,21 +221,7 @@ function updateArc(arc, { bounds, randomize, speed }) {
     arc.endY = arc.centerY - arc.radius * Math.sin(arc.theta);
 
     // Overflow.
-    if (arc.endX < 0) {
-        arc.endX += bounds.width;
-        arc.centerX += bounds.width
-    } else if (arc.endX > bounds.width) {
-        arc.endX -= bounds.width;
-        arc.centerX -= bounds.width
-    }
-
-    if (arc.endY < 0) {
-        arc.endY += bounds.height;
-        arc.centerY += bounds.height
-    } else if (arc.endY > bounds.height) {
-        arc.endY -= bounds.height;
-        arc.centerY -= bounds.height
-    }
+    arc = overflowArc(arc, bounds);
 
     return arc;
 }
@@ -243,6 +249,26 @@ function updateVisionGrid(arc, config, grids) {
     }, []);
 }
 
+function overflowArc(arc, bounds) {
+    if (arc.endX < 0) {
+        arc.endX += bounds.width;
+        arc.centerX += bounds.width
+    } else if (arc.endX > bounds.width) {
+        arc.endX -= bounds.width;
+        arc.centerX -= bounds.width
+    }
+
+    if (arc.endY < 0) {
+        arc.endY += bounds.height;
+        arc.centerY += bounds.height
+    } else if (arc.endY > bounds.height) {
+        arc.endY -= bounds.height;
+        arc.centerY -= bounds.height
+    }
+
+    return arc;
+}
+
 function moveArc(arc, newRadius) {
     const r0 = arc.radius;
     const r1 = newRadius;
@@ -263,6 +289,20 @@ function changeDirection(arc) {
     return arc;
 }
 
+// ===== ACTIONS =====
+function evade(arc, visionGrid) {
+    const danger = visionGrid.reduce((acc, v) => acc || v.touch, false);
+
+    if (danger === false) {
+        return arc;
+    }
+
+    const evasionArc = moveArc(arc, 20);
+    evasionArc.length = 1;
+
+    return evasionArc;
+}
+
 // ===== RENDERING =====
 function repaintContainer(node, arc) {
     node.style.left = `${arc.endX}px`;