1 files changed, 21 insertions, 9 deletions
diff --git a/js/util.js b/js/util.js
index 1a1a0fe..911e44b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -6,24 +6,30 @@ if (window.$) {
   $.fn.disable = function() { return $(this).attr("disabled","disabled") }
 }
 
+function noop(){}
 function trim(s){ return s.replace(/^\s+/,"").replace(/\s+$/,"") }
 
 var E = Math.E
 var PI = Math.PI
 var PHI = (1+Math.sqrt(5))/2
+var TWO_PI = PI*2
+var LN10 = Math.LN10
 function clamp(n,a,b){ return n<a?a:n<b?n:b }
+function norm(n,a,b){ return (n-a) / (b-a) }
 function lerp(n,a,b){ return (b-a)*n+a }
 function mix(n,a,b){ return a*(1-n)+b*n }
 function ceil(n){ return Math.ceil(n) }
 function floor(n){ return Math.floor(n) }
 function round(n){ return Math.round(n) }
-function max(n){ return Math.max(n) }
-function min(n){ return Math.min(n) }
+function max(a,b){ return Math.max(a,b) }
+function min(a,b){ return Math.min(a,b) }
 function abs(n){ return Math.abs(n) }
 function sign(n){ return Math.abs(n)/n }
 function pow(n,b) { return Math.pow(n,b) }
 function exp(n) { return Math.exp(n) }
-function sqrt(n) { return Math.sqrt(n,b) }
+function log(n){ return Math.log(n) }
+function ln(n){ return Math.log(n)/LN10 }
+function sqrt(n) { return Math.sqrt(n) }
 function cos(n){ return Math.cos(n) }
 function sin(n){ return Math.sin(n) }
 function tan(n){ return Math.tan(n) }
@@ -39,11 +45,19 @@ function sinp(n){ return (1+Math.sin(n))/2 }
 function random(){ return Math.random() }
 function rand(n){ return (Math.random()*n) }
 function randint(n){ return rand(n)|0 }
+function randrange(a,b){ return a + rand(b-a) }
+function randsign(){ return random() >= 0.5 ? -1 : 1 }
 function choice(a){ return a[randint(a.length)] }
 function deg(n){ return n*180/PI }
 function rad(n){ return n*PI/180 }
 function xor(a,b){ a=!!a; b=!!b; return (a||b) && !(a&&b) }
-function pixel(x,y){ return 4*(mod(y,h)*w+mod(x,w)) }
+function mod(n,m){ return n-(m * floor(n/m)) }
+function dist(x0,y0,x1,y1){ return sqrt(pow(x1-x0,2)+pow(y1-y0,2)) }
+function angle(x0,y0,x1,y1){ return atan2(y1-y0,x1-x0) }
+function avg(m,n,a){ return (m*(a-1)+n)/a }
+function quantize(a,b){ return ~~(a/b)*b }
+
+function pixel(x,y){ return 4*(mod(y,actual_h)*actual_w+mod(x,actual_w)) }
 function rgbpixel(d,x,y){
   var p = pixel(~~x,~~y)
   r = d[p]
@@ -51,18 +65,16 @@ function rgbpixel(d,x,y){
   b = d[p+2]
   a = d[p+3]
 }
-function mod(n,m){ return n-(m * floor(n/m)) }
-function dist(x0,y0,x1,y1){ return sqrt(pow(x1-x0,2)+pow(y1-y0,2)) }
-function angle(x0,y0,x1,y1){ return atan2(y1-y0,x1-x0) }
-function avg(m,n,a){ return (m*(a-1)+n)/a }
+function fit(d,x,y){ rgbpixel(d,x*actual_w/w,y*actual_h/h) }
 
 function step(a, b){
   return (b >= a) + 0 
                // ^^ bool -> int
 }
 
+
 function julestep (a,b,n) {
-  return clamp((n - a) / (b - a), 0.0, 1.0);
+  return clamp(norm(n,a,b), 0.0, 1.0);
 }
 
 // hermite curve apparently