Revert "Get rid of the function keywords"

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

diff --git a/js/animation.js b/js/animation.js
index f33198215d0e0e5947c03c5480d673b83e0d0433..07b8d34a3aabb82266f79ec4520ee2c361171605 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,78 +1,78 @@
 (function () {
 
   var K = document.querySelector('canvas'),
 (function () {
 
   var K = document.querySelector('canvas'),

-      { random: r, PI, cos, sin, floor, atan2 } = Math,
-      ctx = K.getContext('2d'),
-      fps = 24,
-      lst = 0,
+      { random: R, PI, cos: C, sin: S, floor, atan2: A } = Math,
+      x = K.getContext('2d'),
+      f = 24,
+      l = 0,

       spd = 1,
       spd = 1,

-      siz = 5 + rnd(10),
-      clr = r() > 0.5,
-      ccl = r() > 0.5,
-      I = Array(rnd(10) + 6).fill(null).map(() => ({
-        x: rnd(64),
-        y: rnd(64),
-        a: r() * 2 * PI,
-        c: Array(3).fill(rnd(256))
+      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))

       })),
       })),

-      SHP = [sqr, crc, hrt, chs, lch],
-      POS = [id, spn(5), spn(15)],
-      draw = SHP[rnd(SHP.length)],
-      pos = POS[rnd(POS.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 floor(r() * x);
+  function r(x) {
+    return floor(R() * x);

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

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

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

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

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

-    ctx.beginPath();
-    ctx.moveTo(p.x, p.y);
-    ctx.lineTo(p.x * 10 * cos(i.a), p.y * 10 * sin(i.a));
-    ctx.lineTo(rnd(64), rnd(64));
-    ctx.fill();
+    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);
   }
 
   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 * cos(i.a), p.y * 10 * sin(i.a));
-    ctx.stroke();
+    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);
   }
 
   function hrt(i) {
 
     var p = pos(i);

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

   }
 
   function id(p) {
   }
 
   function id(p) {


@@ -81,26 +81,23 @@
   }
 
   function spn(rad) {
   }
 
   function spn(rad) {

-    return function (p) {
-
-      return {
-        x: p.x + rad * cos(lst),
-        y: p.y + rad * sin(lst)
-      }
-    }
+    return (p) => ({
+        x: p.x + rad * C(l),
+        y: p.y + rad * S(l)
+    })

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

-    i.x = i.x + spd * cos(i.a);
-    i.y = i.y + spd * sin(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) {
 
     if (i.x < 0 || i.x > 64) {

-      i.a = atan2(sin(i.a), -cos(i.a))
+      i.a = A(S(i.a), -C(i.a))

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

-      i.a = atan2(-sin(i.a), cos(i.a))
+      i.a = A(-S(i.a), C(i.a))

     }
   }
 
     }
   }
 


@@ -116,18 +113,18 @@
 
     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) {
       for (var i of I) {

-        ctx.fillStyle = `rgb(${i.c.join(',')})`;
+        x.fillStyle = `rgb(${i.c.join(',')})`;

         draw(i);
         ccl && ucl(i);
         mov(i);
       }
 
         draw(i);
         ccl && ucl(i);
         mov(i);
       }
 

-      lst = t;
+      l = t;

     }
   }
 
     }
   }