Move id and spn to top

[rbdr/r.bdr.sh] / js / animation.js

diff --git a/js/animation.js b/js/animation.js
index 32695009d11f484cc7667558b981937069bf2627..a585332a7a53aca1d449dc77dc9d46c2b66bea1b 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,10 +1,15 @@
 (function () {
 
   var K = document.querySelector('canvas'),
-      { random: R, PI, cos: c, sin: s, floor, atan2 } = Math,
-      ctx = K.getContext('2d'),
-      fps = 24,
-      lst = 0,
+      { random: R, PI, cos: C, sin: S, floor, atan2: A } = Math,
+      id = p => p,
+      spn = rad => p => ({
+          x: p.x + rad * C(l),
+          y: p.y + rad * S(l)
+      }),
+      x = K.getContext('2d'),
+      f = 24,
+      l = 0,
       spd = 1,
       siz = 5 + r(10),
       clr = R() > 0.5,
@@ -15,119 +20,102 @@
         a: R() * 2 * PI,
         c: Array(3).fill(r(256))
       })),
-      S = [sqr, crc, hrt, chs, lch],
+      H = [sqr, crc, hrt, chs, lch],
       P = [id, spn(5), spn(15)],
-      draw = S[r(S.length)],
-      pos = P[r(P.length)];
+      draw = H[r(H.length)],
+      pos = P[r(P.length)]
 
   function r(x) {
-    return floor(R() * x);
+    return floor(R() * x)
   }
 
   function sqr(i) {
 
-    var p = pos(i);
-    ctx.fillRect(p.x, p.y, siz, siz);
+    var p = pos(i)
+    x.fillRect(p.x, p.y, siz, siz)
   }
 
   function crc(i) {
 
-    var p = pos(i);
-    ctx.beginPath();
-    ctx.arc(p.x, p.y, siz / 2, 0, 2 * PI);
-    ctx.fill();
+    var p = pos(i)
+    x.beginPath()
+    x.arc(p.x, p.y, siz / 2, 0, 2 * PI)
+    x.fill()
   }
 
   function chs(i) {
 
-    var p = pos(i);
-    ctx.beginPath();
-    ctx.moveTo(p.x, p.y);
-    ctx.lineTo(p.x * 10 * c(i.a), p.y * 10 * s(i.a));
-    ctx.lineTo(r(64), r(64));
-    ctx.fill();
+    var p = pos(i)
+    x.beginPath()
+    x.moveTo(p.x, p.y)
+    x.lineTo(p.x * 10 * C(i.a), p.y * 10 * S(i.a))
+    x.lineTo(r(64), r(64))
+    x.fill()
   }
 
   function lch(i) {
 
-    var p = pos(i);
-    ctx.beginPath();
-    ctx.lineWidth = 5;
-    ctx.strokeStyle = `rgb(${i.c.join(',')})`;
-    ctx.moveTo(p.x, p.y);
-    ctx.lineTo(p.x * 10 * c(i.a), p.y * 10 * s(i.a));
-    ctx.stroke();
+    var p = pos(i)
+    x.beginPath()
+    x.lineWidth = 5
+    x.strokeStyle = `rgb(${i.c.join(',')})`
+    x.moveTo(p.x, p.y)
+    x.lineTo(p.x * 10 * C(i.a), p.y * 10 * S(i.a))
+    x.stroke()
   }
 
   function hrt(i) {
 
-    var p = pos(i);
-    ctx.fillRect(p.x, p.y, siz, siz);
+    var p = pos(i)
+    x.fillRect(p.x, p.y, siz, siz)
 
-    ctx.beginPath();
-    ctx.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false);
-    ctx.fill();
-    ctx.closePath();
+    x.beginPath()
+    x.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false)
+    x.fill()
+    x.closePath()
 
-    ctx.beginPath();
-    ctx.arc(p.x + siz, p.y + siz / 2, siz / 2, 0, 2 * PI, false);
-    ctx.fill();
-    ctx.closePath();
-  }
-
-  function id(p) {
-
-    return p;
-  }
-
-  function spn(rad) {
-    return (p) => ({
-        x: p.x + rad * c(lst),
-        y: p.y + rad * s(lst)
-    })
+    x.beginPath()
+    x.arc(p.x + siz, p.y + siz / 2, siz / 2, 0, 2 * PI, false)
+    x.fill()
+    x.closePath()
   }
 
   function mov(i) {
 
-    i.x = i.x + spd * c(i.a);
-    i.y = i.y + spd * s(i.a);
+    i.x = i.x + spd * C(i.a)
+    i.y = i.y + spd * S(i.a)
 
     if (i.x < 0 || i.x > 64) {
-      i.a = atan2(s(i.a), -c(i.a))
+      i.a = A(S(i.a), -C(i.a))
     }
-
     if (i.y < 0 || i.y > 64) {
-      i.a = atan2(-s(i.a), c(i.a))
+      i.a = A(-S(i.a), C(i.a))
     }
   }
 
   function ucl(i) {
-
-    i.c = i.c.map((c) => {
-      c = c + 5;
-      return c > 255 ? 0 : c;
-    })
+    i.c = i.c.map(c => (c + 5) % 256)
   }
 
   function frm(t) {
 
-    window.requestAnimationFrame(frm);
+    window.requestAnimationFrame(frm)
 
-    var dt = t - lst;
+    var dt = t - l
 
-    if (dt > 1000 / fps) {
-      clr && ctx.clearRect(0, 0, 64, 64);
+    if (dt > 1000 / f) {
+      clr && x.clearRect(0, 0, 64, 64)
       for (var i of I) {
-        ctx.fillStyle = `rgb(${i.c.join(',')})`;
-        draw(i);
-        ccl && ucl(i);
-        mov(i);
+        x.fillStyle = `rgb(${i.c.join(',')})`
+        draw(i)
+        ccl && ucl(i)
+        mov(i)
       }
 
-      lst = t;
+      l = t
     }
   }
 
-  frm();
+  frm()
 }
-)();
+)()