x and y

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

diff --git a/js/animation.js b/js/animation.js
index 074b1df3dd15ec556ac3f2081d7f3dfe1b6b1d67..f7b138cf16252cad7c0d3e3221149db9c41fc1ba 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,139 +1,121 @@
 (function () {
 
 (function () {
 

-  var canvas = document.querySelector('canvas'),
-      r = Math.random,
-      pi = Math.PI,
-      cos = Math.cos,
-      sin = Math.sin,
-      ctx = canvas.getContext('2d'),
-      fps = 24,
-      lst = 0,
-      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))
+  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: 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)];
+      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) {
 
   }
 
   function sqr(i) {
 

-    var p = pos(i);
-    ctx.fillRect(p.x, p.y, siz, siz);
+    var {x, y} = pos(i)
+    X.fillRect(x, y, z, z)

   }
 
   function crc(i) {
 
   }
 
   function crc(i) {
 

-    var p = pos(i);
-    ctx.beginPath();
-    ctx.arc(p.x, p.y, siz / 2, 0, 2 * pi);
-    ctx.fill();
+    var {x, y} = pos(i)
+    X.beginPath()
+    X.arc(x, y, z / 2, 0, 2 * PI)
+    X.fill()

   }
 
   function chs(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();
+    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) {
 
   }
 
   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();
+    var {x, y} = pos(i)
+    X.beginPath()
+    X.lineWidth = 5
+    X.strokeStyle = `rgb(${i.c.join(',')})`
+    X.moveTo(x, y)
+    X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a))
+    X.stroke()

   }
 
   function hrt(i) {
 
   }
 
   function hrt(i) {
 

-    var p = pos(i);
-    ctx.fillRect(p.x, p.y, siz, siz);
+    var {x, y} = pos(i)
+    X.fillRect(x, y, z, z)

 
 

-    ctx.beginPath();
-    ctx.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * pi, false);
-    ctx.fill();
-    ctx.closePath();
+    X.beginPath()
+    X.arc(x + z / 2, y, z / 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();
-  }
-
-  function id(p) {
-
-    return p;
-  }
-
-  function spn(rad) {
-    return function (p) {
-
-      return {
-        x: p.x + rad * cos(lst),
-        y: p.y + rad * sin(lst)
-      }
-    }
+    X.beginPath()
+    X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)
+    X.fill()
+    X.closePath()

   }
 
   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 + s * C(i.a)
+    i.y = i.y + s * S(i.a)

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

-      i.a = Math.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 = Math.atan2(-sin(i.a), cos(i.a))
+      i.a = A(-S(i.a), C(i.a))

     }
   }
 
   function ucl(i) {
     }
   }
 
   function ucl(i) {

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

   }
 
   function frm(t) {
 
   }
 
   function frm(t) {
 

-    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) {
+      k && X.clearRect(0, 0, 64, 64)

       for (var i of I) {
       for (var i of I) {

-        ctx.fillStyle = `rgb(${i.c.join(',')})`;
-        draw(i);
-        ccl && ucl(i);
-        mov(i);
+        X.fillStyle = `rgb(${i.c.join(',')})`
+        draw(i)
+        c && ucl(i)
+        mov(i)

       }
 
       }
 

-      lst = t;
+      l = t

     }
   }
 
     }
   }
 

-  frm();
+  frm()

 }
 }

-)();
+)()