Revert "Remove function"

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

diff --git a/js/animation.js b/js/animation.js
index d5bc6b8f56faf29e8d62a524b8674736d2ff2cbf..a585332a7a53aca1d449dc77dc9d46c2b66bea1b 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,146 +1,121 @@
 (function () {
 
 (function () {
 

-  var canvas = document.querySelector('canvas'),
-      r = Math.random,
-      pi = Math.PI,
-      cos = Math.cos,
-      sin = Math.sin,
-      context = canvas.getContext('2d'),
-      fps = 30,
-      lastFrame = 0,
-      speed = 1,
-      size = 5 + rand(10);
-
-  var clear = !!(r() > 0.5);
-  var changeColor = !!(r() > 0.5);
-  var 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 shapes = [square, circle, heart, chaos, lineChaos];
-  var positions = [identity, spin(5), spin(15)];
-  var draw = shapes[rand(shapes.length)];
-  var position = positions[rand(positions.length)];
-
-  function rand (x) {
-    return Math.floor(r() * x);
+  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,
+      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))
+      })),
+      H = [sqr, crc, hrt, chs, lch],
+      P = [id, spn(5), spn(15)],
+      draw = H[r(H.length)],
+      pos = P[r(P.length)]
+
+  function r(x) {
+    return floor(R() * x)

   }
 
   }
 

-  function square(item) {
+  function sqr(i) {

 
 

-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
+    var p = pos(i)
+    x.fillRect(p.x, p.y, siz, siz)

   }
 
   }
 

-  function circle(item) {
+  function crc(i) {

 
 

-    var p = position(item);
-    context.beginPath();
-    context.arc(p.x, p.y, size / 2, 0, 2 * pi);
-    context.fill();
+    var p = pos(i)
+    x.beginPath()
+    x.arc(p.x, p.y, siz / 2, 0, 2 * PI)
+    x.fill()

   }
 
   }
 

-  function chaos(item) {
+  function chs(i) {

 
 

-    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();
+    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 lineChaos(item) {
+  function lch(i) {

 
 

-    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();
+    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 square(item) {
+  function hrt(i) {

 
 

-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
-  }
-
-  function heart(item) {
+    var p = pos(i)
+    x.fillRect(p.x, p.y, siz, siz)

 
 

-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
+    x.beginPath()
+    x.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false)
+    x.fill()
+    x.closePath()

 
 

-    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();
+    x.beginPath()
+    x.arc(p.x + siz, p.y + siz / 2, siz / 2, 0, 2 * PI, false)
+    x.fill()
+    x.closePath()

   }
 
   }
 

-  function identity(position) {
+  function mov(i) {

 
 

-    return position;
-  }
+    i.x = i.x + spd * C(i.a)
+    i.y = i.y + spd * S(i.a)

 
 

-  function spin(radius) {
-    return function (position) {
-
-      return {
-        x: position.x + radius * cos(lastFrame),
-        y: position.y + radius * sin(lastFrame)
-      }
+    if (i.x < 0 || i.x > 64) {
+      i.a = A(S(i.a), -C(i.a))

     }
     }

-  }
-
-  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))
+    if (i.y < 0 || i.y > 64) {
+      i.a = A(-S(i.a), C(i.a))

     }
   }
 
     }
   }
 

-  function updateColor(item) {
-
-    item.color = item.color.map((c) => {
-      c = c + 5;
-      return c > 255 ? 0 : c;
-    })
+  function ucl(i) {
+    i.c = i.c.map(c => (c + 5) % 256)

   }
 
   }
 

-  function frame(time) {
+  function frm(t) {

 
 

-    window.requestAnimationFrame(frame);
+    window.requestAnimationFrame(frm)

 
 

-    var delta = time - lastFrame;
+    var dt = t - l

 
 

-    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);
+    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)

       }
 
       }
 

-      lastFrame = time;
+      l = t

     }
   }
 
     }
   }
 

-  frame();
+  frm()

 }
 }

-)();
+)()