From c18321ceedd7be750f5789109c8503e4a36f39bf Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 17 Dec 2013 09:00:29 -0500 Subject: dist & angle --- instructions.html | 2 ++ js/util.js | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/instructions.html b/instructions.html index 25f6e32..612cf2e 100644 --- a/instructions.html +++ b/instructions.html @@ -34,6 +34,8 @@ step(n,a,b) smoothstep(n,a,b) cosp, sinp (mapped to [0,1]) pixel(x,y) == 4*(y*w+h) +dist(x,y,a,b) +angle(x,y,a,b) rand(n), randint(n) choice(array) deg(radians), rad(degrees) diff --git a/js/util.js b/js/util.js index bbf8674..7ecb20b 100644 --- a/js/util.js +++ b/js/util.js @@ -41,7 +41,9 @@ function choice(a){ return a[randint(a.length)] } function deg(n){ return n*180/PI } function rad(n){ return n*PI/180 } function pixel(x,y){ return 4*(y*w+x) } -function mod(n,m){ return n-(m * Math.floor(n/m)) } +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 step (n,a,b) { return clamp((n - a) / (b - a), 0.0, 1.0); -- cgit v1.2.3-70-g09d2