X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/blobdiff_plain/55ca90876437f97ea98ff9e17535c9c1fc7b4f95..4b678bee90d50050745332a42a375883bf2ec00d:/js/animation.js?ds=sidebyside

diff --git a/js/animation.js b/js/animation.js
index a585332..ecf5e43 100644
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,89 +1,75 @@
 (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,
-      spd = 1,
-      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))
-      })),
-      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 p = pos(i)
-    x.fillRect(p.x, p.y, siz, siz)
+    X.fillRect(p.x, p.y, z, z)
   }
 
   function crc(i) {
-
     var p = pos(i)
-    x.beginPath()
-    x.arc(p.x, p.y, siz / 2, 0, 2 * PI)
-    x.fill()
+    B()
+    X.arc(p.x, p.y, z / 2, 0, 2 * PI)
+    F()
   }
 
   function chs(i) {
-
-    var p = pos(i)
-    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()
+    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 lch(i) {
-
-    var p = pos(i)
-    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()
+    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 hrt(i) {
-
-    var p = pos(i)
-    x.fillRect(p.x, p.y, siz, siz)
-
-    x.beginPath()
-    x.arc(p.x + siz / 2, p.y, siz / 2, 0, 2 * PI, false)
-    x.fill()
-    x.closePath()
-
-    x.beginPath()
-    x.arc(p.x + siz, p.y + siz / 2, siz / 2, 0, 2 * PI, false)
-    x.fill()
-    x.closePath()
+    var {x, y} = pos(i)
+    X.fillRect(x, y, z, z)
+
+    B()
+    X.arc(x + z / 2, y, z / 2, 0, 2 * PI, false)
+    F()
+    X.closePath()
+
+    B()
+    X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)
+    F()
+    X.closePath()
   }
 
   function mov(i) {
-
-    i.x = i.x + spd * C(i.a)
-    i.y = i.y + spd * S(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) {
       i.a = A(S(i.a), -C(i.a))
@@ -94,21 +80,20 @@
   }
 
   function ucl(i) {
-    i.c = i.c.map(c => (c + 5) % 256)
+    i.c = (i.c + 2) % 101
   }
 
   function frm(t) {
-
-    window.requestAnimationFrame(frm)
+    requestAnimationFrame(frm)
 
     var dt = t - l
 
     if (dt > 1000 / f) {
-      clr && x.clearRect(0, 0, 64, 64)
+      k && X.clearRect(0, 0, 64, 64)
       for (var i of I) {
-        x.fillStyle = `rgb(${i.c.join(',')})`
+        X.fillStyle = `hsl(0,0%,${i.c}%)`
         draw(i)
-        ccl && ucl(i)
+        c && ucl(i)
         mov(i)
       }