X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/blobdiff_plain/60084ea2a6cc7c001a4bbeb46f2d296afc3ecdac..c2e5b373b16f341478100ef5a1e8025d11c7886c:/js/animation.js

diff --git a/js/animation.js b/js/animation.js
index 2474be3..ecf5e43 100644
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,87 +1,73 @@
 (function () {
 
   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: r(256)
-      })),
-      H = [sqr, crc, hrt, chs, lch],
-      P = [id, spn(5), spn(15)],
-      draw = H[r(H.length)],
-      pos = P[r(P.length)]
+    { 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 floor(R() * x)
+    return ~~(R() * x)
   }
 
   function sqr(i) {
-
-    var {x, y} = pos(i)
-    X.fillRect(x, y, z, z)
+    var p = pos(i)
+    X.fillRect(p.x, p.y, z, z)
   }
 
   function crc(i) {
-
-    var {x, y} = pos(i)
-    X.beginPath()
-    X.arc(x, y, z / 2, 0, 2 * PI)
-    X.fill()
+    var p = pos(i)
+    B()
+    X.arc(p.x, p.y, z / 2, 0, 2 * PI)
+    F()
   }
 
   function chs(i) {
-
     var {x, y} = pos(i)
-    X.beginPath()
+    B()
     X.moveTo(x, y)
     X.lineTo(x * 10 * C(i.a), y * 10 * S(i.a))
     X.lineTo(r(64), r(64))
-    X.fill()
+    F()
   }
 
   function lch(i) {
-
     var {x, y} = pos(i)
-    X.beginPath()
+    B()
     X.lineWidth = 5
-    X.strokeStyle = `hsl(0,0,${i.c})`
+    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 hrt(i) {
-
     var {x, y} = pos(i)
     X.fillRect(x, y, z, z)
 
-    X.beginPath()
+    B()
     X.arc(x + z / 2, y, z / 2, 0, 2 * PI, false)
-    X.fill()
+    F()
     X.closePath()
 
-    X.beginPath()
+    B()
     X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)
-    X.fill()
+    F()
     X.closePath()
   }
 
   function mov(i) {
-
     i.x = i.x + s * C(i.a)
     i.y = i.y + s * S(i.a)
 
@@ -94,11 +80,10 @@
   }
 
   function ucl(i) {
-    i.c = (i.c + 5) % 256
+    i.c = (i.c + 2) % 101
   }
 
   function frm(t) {
-
     requestAnimationFrame(frm)
 
     var dt = t - l
@@ -106,7 +91,7 @@
     if (dt > 1000 / f) {
       k && X.clearRect(0, 0, 64, 64)
       for (var i of I) {
-        X.fillStyle = `hsl(0,0,${i.c})`
+        X.fillStyle = `hsl(0,0%,${i.c}%)`
         draw(i)
         c && ucl(i)
         mov(i)