Remove some spaces

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

diff --git a/js/animation.js b/js/animation.js
index b579fea1e0b197006ba05fc1bb9ea0dddf35cce0..9c8723f3ba81e4f344be9f67bc052a1495728008 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,145 +1,115 @@
 (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 + rnd(10),
-      clear = !!(r() > 0.5),
-      changeColor = !!(r() > 0.5),
-      items = Array(rnd(10) + 6).fill(null).map(() => ({
-        x: rnd(64),
-        y: rnd(64),
-        angle: r() * 2 * pi,
-        color: Array(3).fill(rnd(256))
+  var K = document.querySelector('canvas'),
+      { 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, s = 1, z = 5 + r(10),
+      k = R() > 0.5, c = R() > 0.5,
+      I = Array(r(10) + 6).fill().map(() => ({
+        x: r(64),
+        y: r(64),
+        a: R() * 2 * PI,
+        c: r(100)
       })),
-      shapes = [sqr, crc, hrt, chs, lch],
-      positions = [id, spn(5), spn(15)],
-      draw = shapes[rnd(shapes.length)],
-      pos = positions[rnd(positions.length)];
+      H = [sqr, crc, hrt, chs, lch], P = [id, spn(5), spn(15)],
+      draw = H[r(H.length)], pos = P[r(P.length)]
 
-  function rnd (x) {
-    return Math.floor(r() * x);
+  function r(x) {
+    return floor(R() * x)
   }
 
   function sqr(i) {
 
-    var p = pos(i);
-    context.fillRect(p.x, p.y, size, size);
+    var {x, y} = pos(i)
+    X.fillRect(x, y, z, z)
   }
 
   function crc(i) {
 
-    var p = pos(i);
-    context.beginPath();
-    context.arc(p.x, p.y, size / 2, 0, 2 * pi);
-    context.fill();
+    var {x, y} = pos(i)
+    X.beginPath()
+    X.arc(x, y, z / 2, 0, 2 * PI)
+    X.fill()
   }
 
   function chs(i) {
 
-    var p = pos(i);
-    context.beginPath();
-    context.moveTo(p.x, p.y);
-    context.lineTo(p.x * 10 * cos(i.angle), p.y * 10 * sin(i.angle));
-    context.lineTo(rnd(64), rnd(64));
-    context.fill();
+    var {x, y} = pos(i)
+    X.beginPath()
+    X.moveTo(x, y)
+    X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a))
+    X.lineTo(r(64), r(64))
+    X.fill()
   }
 
   function lch(i) {
 
-    var p = pos(i);
-    context.beginPath();
-    context.lineWidth = 5;
-    context.strokeStyle = `rgb(${i.color.join(',')})`;
-    context.moveTo(p.x, p.y);
-    context.lineTo(p.x * 10 * cos(i.angle), p.y * 10 * sin(i.angle));
-    context.stroke();
-  }
-
-  function sqr(i) {
-
-    var p = pos(i);
-    context.fillRect(p.x, p.y, size, size);
+    var {x, y} = pos(i)
+    X.beginPath()
+    X.lineWidth = 5
+    X.strokeStyle = `hsl(0,0%,${i.c}%)`
+    X.moveTo(x, y)
+    X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a))
+    X.stroke()
   }
 
   function hrt(i) {
 
-    var p = pos(i);
-    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 id(p) {
-
-    return p;
-  }
+    var {x, y} = pos(i)
+    X.fillRect(x, y, z, z)
 
-  function spn(rad) {
-    return function (p) {
+    X.beginPath()
+    X.arc(x + z / 2, y, z / 2, 0, 2 * PI, false)
+    X.fill()
+    X.closePath()
 
-      return {
-        x: p.x + rad * cos(lastFrame),
-        y: p.y + rad * sin(lastFrame)
-      }
-    }
+    X.beginPath()
+    X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)
+    X.fill()
+    X.closePath()
   }
 
   function mov(i) {
 
-    i.x = i.x + speed * cos(i.angle);
-    i.y = i.y + speed * sin(i.angle);
+    i.x = i.x + s * C(i.a)
+    i.y = i.y + s * S(i.a)
 
     if (i.x < 0 || i.x > 64) {
-      i.angle = Math.atan2(sin(i.angle), -cos(i.angle))
+      i.a = A(S(i.a), -C(i.a))
     }
-
     if (i.y < 0 || i.y > 64) {
-      i.angle = Math.atan2(-sin(i.angle), cos(i.angle))
+      i.a = A(-S(i.a), C(i.a))
     }
   }
 
-  function updateColor(i) {
-
-    i.color = i.color.map((c) => {
-      c = c + 5;
-      return c > 255 ? 0 : c;
-    })
+  function ucl(i) {
+    i.c = (i.c + 2) % 101
   }
 
-  function frame(time) {
+  function frm(t) {
 
-    window.requestAnimationFrame(frame);
+    requestAnimationFrame(frm)
 
-    var delta = time - lastFrame;
+    var dt = t - l
 
-    if (delta > 1000 / fps) {
-      clear && context.clearRect(0, 0, 64, 64);
-      for (var i of items) {
-        context.fillStyle = `rgb(${i.color.join(',')})`;
-        draw(i);
-        changeColor && updateColor(i);
-        mov(i);
+    if (dt > 1000 / f) {
+      k && X.clearRect(0, 0, 64, 64)
+      for (var i of I) {
+        X.fillStyle = `hsl(0,0%,${i.c}%)`
+        draw(i)
+        c && ucl(i)
+        mov(i)
       }
 
-      lastFrame = time;
+      l = t
     }
   }
 
-  frame();
+  frm()
 }
-)();
+)()