Move id and spn to top

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

diff --git a/js/animation.js b/js/animation.js
index 4c04e122d41a69605ecf3ec534d48e9ee8b54e14..a585332a7a53aca1d449dc77dc9d46c2b66bea1b 100644 (file)
--- a/js/animation.js
+++ b/js/animation.js
@@ -2,6 +2,11 @@
 
   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,
@@ -75,25 +80,17 @@
     x.closePath()
   }
 
-  function id(p) {
-
-    return p
-  }
-
-  function spn(rad) {
-    return (p) => ({
-        x: p.x + rad * C(l),
-        y: p.y + rad * S(l)
-    })
-  }
-
   function mov(i) {
 
     i.x = i.x + spd * C(i.a)
     i.y = i.y + spd * S(i.a)
 
-    (i.x < 0 || i.x > 64) && (i.a = A(S(i.a), -C(i.a)))
-    (i.y < 0 || i.y > 64) && (i.a = A(-S(i.a), C(i.a)))
+    if (i.x < 0 || i.x > 64) {
+      i.a = A(S(i.a), -C(i.a))
+    }
+    if (i.y < 0 || i.y > 64) {
+      i.a = A(-S(i.a), C(i.a))
+    }
   }
 
   function ucl(i) {