From 4820e2b2b56721418bb33ea33f1d77dc447b24a2 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Tue, 21 Nov 2017 19:46:27 +1300
Subject: [PATCH] Minor updates to brush

---
 sources/scripts/core/cursor.js   |  8 +++++++-
 sources/scripts/modules/brush.js | 10 ++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/sources/scripts/core/cursor.js b/sources/scripts/core/cursor.js
index 575fd22..68b5784 100644
--- a/sources/scripts/core/cursor.js
+++ b/sources/scripts/core/cursor.js
@@ -53,9 +53,15 @@ function Cursor(rune)
     // Save original query
     ronin.cursor.query = ronin.commander.input_el.value;
 
-    if(e.altKey && e.shiftKey){
+    if(ronin.commander.active_module()){
+
+    }
+    else if(e.altKey && e.shiftKey){
       ronin.brush.methods.pick.run(pos);
     }
+    else{
+      ronin.brush.stroke(ronin.cursor.line);  
+    }
 
     if(e.shiftKey){ ronin.cursor.mode = "rect"; }
     if(e.altKey){ ronin.cursor.mode = "arc_to"; }
diff --git a/sources/scripts/modules/brush.js b/sources/scripts/modules/brush.js
index 619f808..92a2cb1 100644
--- a/sources/scripts/modules/brush.js
+++ b/sources/scripts/modules/brush.js
@@ -33,7 +33,7 @@ function Brush()
   this.thickness = function(line)
   {
     var t = ronin.cursor.size * this.ports.speed;
-    this.absolute_thickness = t > this.absolute_thickness ? this.absolute_thickness+0.5 : this.absolute_thickness-0.5;
+    this.absolute_thickness = t > this.absolute_thickness ? this.absolute_thickness+0.25 : this.absolute_thickness-0.25;
     return this.absolute_thickness * 3;
   }
 
@@ -43,8 +43,6 @@ function Brush()
 
     this.ports.speed = 1-distance_between(line.from,line.to)/15.0;
     this.ports.distance += this.ports.speed;
-    // this.ports.noise = Math.random(255/255.0);
-    // this.ports.x = line.from.x/2;
 
     for(pointer_id in this.pointers){
       this.pointers[pointer_id].stroke(line);
@@ -82,7 +80,7 @@ function Brush()
 
   function distance_between(a,b)
   {
-    return Math.sqrt( (a.x-b.x)*(a.x-b.x) + (a.y-b.y)*(a.y-b.y) );
+    return a && b ? Math.sqrt( (a.x-b.x)*(a.x-b.x) + (a.y-b.y)*(a.y-b.y) ) : 0;
   }
 }
 
@@ -109,6 +107,10 @@ function Pointer(options)
       line.to.x = (this.options.mirror.x*2) - line.to.x;  
     }
 
+    if(!line.to){
+      line.to = line.from
+    }
+
     ctx.beginPath();
     ctx.globalCompositeOperation="source-over";
     ctx.moveTo((line.from.x * 2) + this.options.offset.x,(line.from.y * 2) + this.options.offset.y);