Shorten some more

diff --git a/js/animation.js b/js/animation.js
index 3f44cd81ac8ce48e63d527da7b4ca22a1eb944ef..32695009d11f484cc7667558b981937069bf2627 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,7 +1,7 @@
 (function () {
 
   var K = document.querySelector('canvas'),
 (function () {
 
   var K = document.querySelector('canvas'),

-      { random: R, PI, cos, sin, floor, atan2 } = Math,
+      { random: R, PI, cos: c, sin: s, floor, atan2 } = Math,

       ctx = K.getContext('2d'),
       fps = 24,
       lst = 0,
       ctx = K.getContext('2d'),
       fps = 24,
       lst = 0,


@@ -9,16 +9,16 @@
       siz = 5 + r(10),
       clr = R() > 0.5,
       ccl = R() > 0.5,
       siz = 5 + r(10),
       clr = R() > 0.5,
       ccl = R() > 0.5,

-      I = Array(r(10) + 6).fill(null).map(() => ({
+      I = Array(r(10) + 6).fill().map(() => ({

         x: r(64),
         y: r(64),
         a: R() * 2 * PI,
         c: Array(3).fill(r(256))
       })),
         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[r(SHP.length)],
-      pos = POS[r(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 r(x) {
     return floor(R() * x);
 
   function r(x) {
     return floor(R() * x);


@@ -43,7 +43,7 @@
     var p = pos(i);
     ctx.beginPath();
     ctx.moveTo(p.x, p.y);
     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(p.x * 10 * c(i.a), p.y * 10 * s(i.a));

     ctx.lineTo(r(64), r(64));
     ctx.fill();
   }
     ctx.lineTo(r(64), r(64));
     ctx.fill();
   }


@@ -55,7 +55,7 @@
     ctx.lineWidth = 5;
     ctx.strokeStyle = `rgb(${i.c.join(',')})`;
     ctx.moveTo(p.x, p.y);
     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.lineTo(p.x * 10 * c(i.a), p.y * 10 * s(i.a));

     ctx.stroke();
   }
 
     ctx.stroke();
   }
 


@@ -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(lst),
+        y: p.y + rad * s(lst)
+    })

   }
 
   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 = atan2(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 = atan2(-s(i.a), c(i.a))

     }
   }
 
     }
   }