Shorten some more

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

diff --git a/js/animation.js b/js/animation.js
index b579fea1e0b197006ba05fc1bb9ea0dddf35cce0..32695009d11f484cc7667558b981937069bf2627 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,87 +1,78 @@
 (function () {
 
 (function () {
 

-  var canvas = document.querySelector('canvas'),
-      r = Math.random,
-      pi = Math.PI,
-      cos = Math.cos,
-      sin = Math.sin,
-      context = canvas.getContext('2d'),
+  var K = document.querySelector('canvas'),
+      { random: R, PI, cos: c, sin: s, floor, atan2 } = Math,
+      ctx = K.getContext('2d'),

       fps = 24,
       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))
+      lst = 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))

       })),
       })),

-      shapes = [sqr, crc, hrt, chs, lch],
-      positions = [id, spn(5), spn(15)],
-      draw = shapes[rnd(shapes.length)],
-      pos = positions[rnd(positions.length)];
+      S = [sqr, crc, hrt, chs, lch],
+      P = [id, spn(5), spn(15)],
+      draw = S[r(S.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);
   }
 
   function sqr(i) {
 
     var p = pos(i);

-    context.fillRect(p.x, p.y, size, size);
+    ctx.fillRect(p.x, p.y, siz, siz);

   }
 
   function crc(i) {
 
     var p = pos(i);
   }
 
   function crc(i) {
 
     var p = pos(i);

-    context.beginPath();
-    context.arc(p.x, p.y, size / 2, 0, 2 * pi);
-    context.fill();
+    ctx.beginPath();
+    ctx.arc(p.x, p.y, siz / 2, 0, 2 * PI);
+    ctx.fill();

   }
 
   function chs(i) {
 
     var p = pos(i);
   }
 
   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();
+    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();

   }
 
   function lch(i) {
 
     var p = pos(i);
   }
 
   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);
+    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();

   }
 
   function hrt(i) {
 
     var p = pos(i);
   }
 
   function hrt(i) {
 
     var p = pos(i);

-    context.fillRect(p.x, p.y, size, size);
+    ctx.fillRect(p.x, p.y, siz, siz);

 
 

-    context.beginPath();
-    context.arc(p.x + size / 2, p.y, size / 2, 0, 2 * pi, false);
-    context.fill();
-    context.closePath();
+    ctx.beginPath();
+    ctx.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false);
+    ctx.fill();
+    ctx.closePath();

 
 

-    context.beginPath();
-    context.arc(p.x + size, p.y + size / 2, size / 2, 0, 2 * pi, false);
-    context.fill();
-    context.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) {
   }
 
   function id(p) {


@@ -90,56 +81,53 @@
   }
 
   function spn(rad) {
   }
 
   function spn(rad) {

-    return function (p) {
-
-      return {
-        x: p.x + rad * cos(lastFrame),
-        y: p.y + rad * sin(lastFrame)
-      }
-    }
+    return (p) => ({
+        x: p.x + rad * c(lst),
+        y: p.y + rad * s(lst)
+    })

   }
 
   function mov(i) {
 
   }
 
   function mov(i) {
 

-    i.x = i.x + speed * cos(i.angle);
-    i.y = i.y + speed * sin(i.angle);
+    i.x = i.x + spd * c(i.a);
+    i.y = i.y + spd * s(i.a);

 
     if (i.x < 0 || i.x > 64) {
 
     if (i.x < 0 || i.x > 64) {

-      i.angle = Math.atan2(sin(i.angle), -cos(i.angle))
+      i.a = atan2(s(i.a), -c(i.a))

     }
 
     if (i.y < 0 || i.y > 64) {
     }
 
     if (i.y < 0 || i.y > 64) {

-      i.angle = Math.atan2(-sin(i.angle), cos(i.angle))
+      i.a = atan2(-s(i.a), c(i.a))

     }
   }
 
     }
   }
 

-  function updateColor(i) {
+  function ucl(i) {

 
 

-    i.color = i.color.map((c) => {
+    i.c = i.c.map((c) => {

       c = c + 5;
       return c > 255 ? 0 : c;
     })
   }
 
       c = c + 5;
       return c > 255 ? 0 : c;
     })
   }
 

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

 
 

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

 
 

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

 
 

-    if (delta > 1000 / fps) {
-      clear && context.clearRect(0, 0, 64, 64);
-      for (var i of items) {
-        context.fillStyle = `rgb(${i.color.join(',')})`;
+    if (dt > 1000 / fps) {
+      clr && ctx.clearRect(0, 0, 64, 64);
+      for (var i of I) {
+        ctx.fillStyle = `rgb(${i.c.join(',')})`;

         draw(i);
         draw(i);

-        changeColor && updateColor(i);
+        ccl && ucl(i);

         mov(i);
       }
 
         mov(i);
       }
 

-      lastFrame = time;
+      lst = t;

     }
   }
 
     }
   }
 

-  frame();
+  frm();

 }
 )();
 }
 )();