Get rid of the function keywords

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

diff --git a/js/animation.js b/js/animation.js
index f7642ee11bef970c718f5bcacd72159c6e3892b1..979360181ee21edca1f606cc4f262e8a722b38d7 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,145 +1,102 @@
 (function () {
 
 (function () {
 

-  var canvas = document.querySelector('canvas'),
-      r = Math.random,
-      pi = Math.PI,
-      cos = Math.cos,
-      sin = Math.sin,
-      context = canvas.getContext('2d'),
-      fps = 24,
-      lastFrame = 0,
-      speed = 1,
-      size = 5 + rand(10),
-      clear = !!(r() > 0.5),
-      changeColor = !!(r() > 0.5),
-      items = Array(rand(10) + 6).fill(null).map(() => ({
-        x: rand(64),
-        y: rand(64),
-        angle: r() * 2 * pi,
-        color: Array(3).fill(rand(256))
+  var K = document.querySelector('canvas'),
+      { random: R, PI, cos: C, sin: S, floor, atan2: A } = Math,
+      r = x => floor(R() * x),
+      sqr = i => {
+        var p = pos(i)
+        x.fillRect(p.x, p.y, siz, siz)
+      },
+      crc = i => {
+        var p = pos(i)
+        x.beginPath()
+        x.arc(p.x, p.y, siz / 2, 0, 2 * PI)
+        x.fill()
+      },
+      chs = i => {
+        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()
+      },
+      lch = i => {
+        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()
+      },
+      hrt = i => {
+        var p = pos(i)
+        x.fillRect(p.x, p.y, siz, siz)
+
+        x.beginPath()
+        x.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false)
+        x.fill()
+        x.closePath()
+
+        x.beginPath()
+        x.arc(p.x + siz, p.y + siz / 2, siz / 2, 0, 2 * PI, false)
+        x.fill()
+        x.closePath()
+      },
+      id = p => p,
+      spn = rad => (p => ({
+        x: p.x + rad * C(l),
+        y: p.y + rad * S(l)

       })),
       })),

-      shapes = [square, circle, heart, chaos, lineChaos],
-      positions = [identity, spin(5), spin(15)],
-      draw = shapes[rand(shapes.length)],
-      position = positions[rand(positions.length)];
-
-  function rand (x) {
-    return Math.floor(r() * x);
-  }
-
-  function square(item) {
-
-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
-  }
-
-  function circle(item) {
-
-    var p = position(item);
-    context.beginPath();
-    context.arc(p.x, p.y, size / 2, 0, 2 * pi);
-    context.fill();
-  }
-
-  function chaos(item) {
-
-    var p = position(item);
-    context.beginPath();
-    context.moveTo(p.x, p.y);
-    context.lineTo(p.x * 10 * cos(item.angle), p.y * 10 * sin(item.angle));
-    context.lineTo(rand(64), rand(64));
-    context.fill();
-  }
-
-  function lineChaos(item) {
-
-    var p = position(item);
-    context.beginPath();
-    context.lineWidth = 5;
-    context.strokeStyle = `rgb(${item.color.join(',')})`;
-    context.moveTo(p.x, p.y);
-    context.lineTo(p.x * 10 * cos(item.angle), p.y * 10 * sin(item.angle));
-    context.stroke();
-  }
-
-  function square(item) {
-
-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
-  }
-
-  function heart(item) {
-
-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
-
-    context.beginPath();
-    context.arc(p.x + size / 2, p.y, size / 2, 0, 2 * pi, false);
-    context.fill();
-    context.closePath();
-
-    context.beginPath();
-    context.arc(p.x + size, p.y + size / 2, size / 2, 0, 2 * pi, false);
-    context.fill();
-    context.closePath();
-  }
-
-  function identity(position) {
-
-    return position;
-  }
-
-  function spin(radius) {
-    return function (position) {
-
-      return {
-        x: position.x + radius * cos(lastFrame),
-        y: position.y + radius * sin(lastFrame)
-      }
-    }
-  }
-
-  function move(item) {
-
-    item.x = item.x + speed * cos(item.angle);
-    item.y = item.y + speed * sin(item.angle);
-
-    if (item.x < 0 || item.x > 64) {
-      item.angle = Math.atan2(sin(item.angle), -cos(item.angle))
-    }
-
-    if (item.y < 0 || item.y > 64) {
-      item.angle = Math.atan2(-sin(item.angle), cos(item.angle))
-    }
-  }
-
-  function updateColor(item) {
-
-    item.color = item.color.map((c) => {
-      c = c + 5;
-      return c > 255 ? 0 : c;
-    })
-  }
-
-  function frame(time) {
-
-    window.requestAnimationFrame(frame);
-
-    var delta = time - lastFrame;
-
-    if (delta > 1000 / fps) {
-      clear && context.clearRect(0, 0, 64, 64);
-      for (var item of items) {
-        context.fillStyle = `rgb(${item.color.join(',')})`;
-        draw(item);
-        changeColor && updateColor(item);
-        move(item);
-      }
-
-      lastFrame = time;
-    }
-  }
+      mov = i => {
+        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 = A(S(i.a), -C(i.a))
+        }
+
+        if (i.y < 0 || i.y > 64) {
+          i.a = A(-S(i.a), C(i.a))
+        }
+      },
+      ucl = i => i.c = i.c.map(c => (c + 5) % 256),
+      frm = t => {
+        window.requestAnimationFrame(frm)
+
+        var dt = t - l
+
+        if (dt > 1000 / f) {
+          clr && x.clearRect(0, 0, 64, 64)
+          for (var i of I) {
+            x.fillStyle = `rgb(${i.c.join(',')})`
+            draw(i)
+            ccl && ucl(i)
+            mov(i)
+          }
+
+          l = t
+        }
+      },
+      x = K.getContext('2d'),
+      f = 24,
+      l = 0,
+      spd = 1,
+      siz = 5 + r(10),
+      clr = R() > 0.5,
+      ccl = R() > 0.5,
+      I = Array(r(10) + 6).fill().map(() => ({
+        x: r(64),
+        y: r(64),
+        a: R() * 2 * PI,
+        c: Array(3).fill(r(256))
+      })),
+      S = [sqr, crc, hrt, chs, lch],
+      P = [id, spn(5), spn(15)],
+      draw = S[r(S.length)],
+      pos = P[r(P.length)]

 
 

-  frame();
+  frm()

 }
 }

-)();
+)()