Bind some canvas functions

diff --git a/js/animation.js b/js/animation.js
index 9c8723f3ba81e4f344be9f67bc052a1495728008..6a67699cab06435bf3f74b3356b08e9fa902a5ab 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -1,56 +1,50 @@
 (function () {
 
   var K = document.querySelector('canvas'),
 (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(100)
-      })),
-      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, 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 = 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)
   }
 
   function sqr(i) {
 
   function r(x) {
     return floor(R() * x)
   }
 
   function sqr(i) {

-

     var {x, y} = pos(i)
     X.fillRect(x, y, z, z)
   }
 
   function crc(i) {
     var {x, y} = pos(i)
     X.fillRect(x, y, z, z)
   }
 
   function crc(i) {

-

     var {x, y} = pos(i)
     var {x, y} = pos(i)

-    X.beginPath()
+    B()

     X.arc(x, y, z / 2, 0, 2 * PI)
     X.arc(x, y, z / 2, 0, 2 * PI)

-    X.fill()
+    F()

   }
 
   function chs(i) {
   }
 
   function chs(i) {

-

     var {x, y} = pos(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.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) {
   }
 
   function lch(i) {

-

     var {x, y} = pos(i)
     var {x, y} = pos(i)

-    X.beginPath()
+    B()

     X.lineWidth = 5
     X.strokeStyle = `hsl(0,0%,${i.c}%)`
     X.moveTo(x, y)
     X.lineWidth = 5
     X.strokeStyle = `hsl(0,0%,${i.c}%)`
     X.moveTo(x, y)


@@ -59,23 +53,21 @@
   }
 
   function hrt(i) {
   }
 
   function hrt(i) {

-

     var {x, y} = pos(i)
     X.fillRect(x, y, z, z)
 
     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.arc(x + z / 2, y, z / 2, 0, 2 * PI, false)

-    X.fill()
+    F()

     X.closePath()
 
     X.closePath()
 

-    X.beginPath()
+    B()

     X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)
     X.arc(x + z, y + z / 2, z / 2, 0, 2 * PI, false)

-    X.fill()
+    F()

     X.closePath()
   }
 
   function mov(i) {
     X.closePath()
   }
 
   function mov(i) {

-

     i.x = i.x + s * C(i.a)
     i.y = i.y + s * S(i.a)
 
     i.x = i.x + s * C(i.a)
     i.y = i.y + s * S(i.a)
 


@@ -92,7 +84,6 @@
   }
 
   function frm(t) {
   }
 
   function frm(t) {

-

     requestAnimationFrame(frm)
 
     var dt = t - l
     requestAnimationFrame(frm)
 
     var dt = t - l