more brush stuff

3 files changed, 13 insertions, 5 deletions

diff --git a/assets/test/brush/index.html b/assets/test/brush.html
index cd31198..cd31198 100644
--- a/assets/test/brush/index.html
+++ b/assets/test/brush.html
diff --git a/assets/test/brush/index2.html b/assets/test/brush2.html
index 7094ca8..2263365 100644
--- a/assets/test/brush/index2.html
+++ b/assets/test/brush2.html
@@ -59,7 +59,7 @@ var mymouse = new mouse({
   },
 })
 
-function drawLine (u, v) {
+function drawLine (u, v, A, B, C, D) {
   var radius = 20
 
   var xmin = Math.min(u.x, v.x)
@@ -90,7 +90,7 @@ function drawLine (u, v) {
         d[t+3] = 0
       }
       else {
-        d[t+0] = d[t+1] = d[t+2] = round( (sqrt(dist)/radius) * 255)
+        d[t+0] = d[t+1] = d[t+2] = round( bezier( sqrt(dist)/radius, 0, 0, 1, 1) * 255)
         d[t+3] = 255
       }
     }
@@ -100,10 +100,18 @@ function drawLine (u, v) {
   maskCtx.drawImage(scratch, xmin - radius, ymin - radius)
 }
 
-drawLine( new point( 100, 100 ), new point( 100, 400 ) )
-drawLine( new point( 100, 100 ), new point( 400, 100 ) )
-drawLine( new point( 100, 100 ), new point( 400, 400 ) )
+for (var i = 0; i < 11; i++) {
+  drawLine( new point( 100, 100 + 40 * i), new point (400, 100 + 40 * i ), 0, 0, lerp(i/10, -2, 1), 1 )
+}
+
+// drawLine( new point( 100, 100 ), new point( 100, 400 ) )
+// drawLine( new point( 100, 100 ), new point( 400, 100 ) )
+// drawLine( new point( 100, 100 ), new point( 400, 400 ) )
 
+function bezier(t,a,b,c,d) {
+  var s = (1-t)
+  return s*s*s*a + 3*s*s*b + 3*s*t*t*c + t*t*t*d
+}
 function sqr(x) { return x * x }
 function dist2(v, w) { return sqr(v.x - w.x) + sqr(v.y - w.y) }
 function distToSegmentSquared (p, v, w) {
diff --git a/assets/test/lasso/index.html b/assets/test/lasso.html
index 62a9744..62a9744 100644
--- a/assets/test/lasso/index.html
+++ b/assets/test/lasso.html