Remove height calc

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

diff --git a/js/animation.js b/js/animation.js
index 65ee4bdec2b32430d47da8d276b47ec00dbcf591..ecf5e4352c34020b08da6af5824453ad69307d49 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,142 +1,106 @@
 (function () {
 
 (function () {
 

-  var canvas = document.querySelector('canvas'),
-      context = canvas.getContext('2d'),
-      fps = 30,
-      lastFrame = 0,
-      speed = 1,
-      size = 5 + rand(10);
-
-  var clear = !!(Math.random() > 0.5);
-  var changeColor = !!(Math.random() > 0.5);
-  var items = Array(rand(10) + 6).fill(null).map(() => ({
-    x: rand(100),
-    y: rand(100),
-    angle: Math.random() * 2 * Math.PI,
-    color: Array(3).fill(null).map(() => 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(Math.random() * x);
+  var K = document.querySelector('canvas'),
+    { random: R, PI, cos: C, sin: S, 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 = X.fill.bind(X), B = X.beginPath.bind(X),
+    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: r(100)
+    })),
+    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 ~~(R() * x)

   }
 
   }
 

-  function square(item) {
-
-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
-  }
-
-  function circle(item) {
-
-    var p = position(item);
-    context.beginPath();
-    context.arc(p.x, p.y, size / 2, 0, 2 * Math.PI);
-    context.fill();
-  }
-
-  function chaos(item) {
-
-    var p = position(item);
-    context.beginPath();
-    context.moveTo(p.x, p.y);
-    context.lineTo(p.x * 10 * Math.cos(item.angle), p.y * 10 * Math.sin(item.angle));
-    context.lineTo(rand(100), rand(100));
-    context.fill();
+  function sqr(i) {
+    var p = pos(i)
+    X.fillRect(p.x, p.y, z, z)

   }
 
   }
 

-  function lineChaos(item) {
-
-    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 * Math.cos(item.angle), p.y * 10 * Math.sin(item.angle));
-    context.stroke();
+  function crc(i) {
+    var p = pos(i)
+    B()
+    X.arc(p.x, p.y, z / 2, 0, 2 * PI)
+    F()

   }
 
   }
 

-  function square(item) {
-
-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
+  function chs(i) {
+    var {x, y} = pos(i)
+    B()
+    X.moveTo(x, y)
+    X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a))
+    X.lineTo(r(64), r(64))
+    F()

   }
 
   }
 

-  function heart(item) {
-
-    var p = position(item);
-    context.fillRect(p.x, p.y, size, size);
-
-    context.beginPath();
-    context.arc(p.x + size / 2, p.y, size / 2, 0, 2 * Math.PI, false);
-    context.fill();
-    context.closePath();
-
-    context.beginPath();
-    context.arc(p.x + size, p.y + size / 2, size / 2, 0, 2 * Math.PI, false);
-    context.fill();
-    context.closePath();
+  function lch(i) {
+    var {x, y} = pos(i)
+    B()
+    X.lineWidth = 5
+    X.strokeStyle = `hsl(0,0%,${i.c}%)`
+    X.moveTo(x, y)
+    X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a))
+    X.stroke()

   }
 
   }
 

-  function identity(position) {
+  function hrt(i) {
+    var {x, y} = pos(i)
+    X.fillRect(x, y, z, z)

 
 

-    return position;
-  }
+    B()
+    X.arc(x + z / 2, y, z / 2, 0, 2 * PI, false)
+    F()
+    X.closePath()

 
 

-  function spin(radius) {
-    return function (position) {
-
-      return {
-        x: position.x + radius * Math.cos(lastFrame),
-        y: position.y + radius * Math.sin(lastFrame)
-      }
-    }
+    B()
+    X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)
+    F()
+    X.closePath()

   }
 
   }
 

-  function move(item) {
-
-    item.x = item.x + speed * Math.cos(item.angle);
-    item.y = item.y + speed * Math.sin(item.angle);
+  function mov(i) {
+    i.x = i.x + s * C(i.a)
+    i.y = i.y + s * S(i.a)

 
 

-    if (item.x < 0 || item.x > 100) {
-      item.angle = Math.atan2(Math.sin(item.angle), -Math.cos(item.angle))
+    if (i.x < 0 || i.x > 64) {
+      i.a = A(S(i.a), -C(i.a))

     }
     }

-
-    if (item.y < 0 || item.y > 100) {
-      item.angle = Math.atan2(-Math.sin(item.angle), Math.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 + 2) % 101

   }
 
   }
 

-  function frame(time) {
-
-    window.requestAnimationFrame(frame);
+  function frm(t) {
+    requestAnimationFrame(frm)

 
 

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

 
 

-    if (delta > 1000 / fps) {
-      clear && context.clearRect(0, 0, 100, 100);
-      for (var item of items) {
-        context.fillStyle = `rgb(${item.color.join(',')})`;
-        draw(item);
-        changeColor && updateColor(item);
-        move(item);
+    if (dt > 1000 / f) {
+      k && X.clearRect(0, 0, 64, 64)
+      for (var i of I) {
+        X.fillStyle = `hsl(0,0%,${i.c}%)`
+        draw(i)
+        c && ucl(i)
+        mov(i)

       }
 
       }
 

-      lastFrame = time;
+      l = t

     }
   }
 
     }
   }
 

-  frame();
+  frm()

 }
 }

-)();
+)()