From 39956c106ff4fc9c9db89c83d29a1c6a9f15acff Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sat, 12 Nov 2016 10:23:03 -0800
Subject: [PATCH] Added colors to brush.

---
 scripts/brush.js     | 14 +++++++++++---
 scripts/color.js     | 13 ++++++++++---
 scripts/commander.js |  3 ++-
 scripts/pointer.js   | 24 ++++++++++--------------
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/scripts/brush.js b/scripts/brush.js
index 7bbf3d4..39717ae 100644
--- a/scripts/brush.js
+++ b/scripts/brush.js
@@ -7,9 +7,17 @@ function Brush()
   
   this.command = function(p)
   {
-    var position = new Position(parseInt(p[0]),parseInt(p[1]));
-    var pointer = new Pointer(position);
-    brush.add_pointer(pointer);
+    if(p.length > 1){
+      var position = new Position(parseInt(p[0]),parseInt(p[1]));
+      var pointer = new Pointer(position);
+    }
+    
+    if(p.length > 2){
+      var color = new Color(p[2]);
+      pointer = new Pointer(position,color);
+    }
+    
+    this.add_pointer(pointer);
   }
   
   // Pointers
diff --git a/scripts/color.js b/scripts/color.js
index 2f5c0bf..0b25a2c 100644
--- a/scripts/color.js
+++ b/scripts/color.js
@@ -1,7 +1,14 @@
-function Color()
+function Color(val = '000000')
 {
-  this.hex = function()
+  this.val = val;
+
+  this.rgb = function()
   {
-    return '#ff0000';
+    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(this.val);
+    return result ? {
+        r: parseInt(result[1], 16),
+        g: parseInt(result[2], 16),
+        b: parseInt(result[3], 16)
+    } : null;
   }
 }
\ No newline at end of file
diff --git a/scripts/commander.js b/scripts/commander.js
index efec42b..6c53cc9 100644
--- a/scripts/commander.js
+++ b/scripts/commander.js
@@ -27,7 +27,8 @@ function Commander(element,element_input)
     
     // Brush
     if(parts[0] == ":+"){
-      brush.command(parts.shift());
+      parts.shift();
+      brush.command(parts);
     }
     
     this.hide();
diff --git a/scripts/pointer.js b/scripts/pointer.js
index 51415be..08afc7d 100644
--- a/scripts/pointer.js
+++ b/scripts/pointer.js
@@ -1,4 +1,4 @@
-function Pointer(offset = new Position(), color = new Color())
+function Pointer(offset = new Position(), color = new Color('000000'))
 {
   this.offset = offset;
   this.color = color;
@@ -9,28 +9,24 @@ function Pointer(offset = new Position(), color = new Color())
   {
     if(!this.position_prev){this.position_prev = this.position(); }
     
-    /* Verteces
-    var id = context.createImageData(1,1);
-    var d  = id.data;
-    d[0]   = 0;
-    d[1]   = 0;
-    d[2]   = 0;
-    d[3]   = 255;
-    context.putImageData(id,this.position().x,this.position().y);
-    */
-    
     context.beginPath();
     context.moveTo(this.position_prev.x,this.position_prev.y);
     context.lineTo(this.position().x,this.position().y);
     context.lineCap="round";
-    var thick = 100 - ((this.position().distance_to(this.position_prev)));
-    context.lineWidth = thick/20;
-    context.strokeStyle = this.color.hex();
+    context.lineWidth = this.thickness();
+    context.strokeStyle = "rgba("+this.color.rgb().r+","+this.color.rgb().g+","+this.color.rgb().b+","+1+")";
     context.stroke();
     
     this.position_prev = this.position();
   }
   
+  this.thickness = function()
+  {
+    var v = 100 - ((this.position().distance_to(this.position_prev)));
+    var t = v/20;
+    return t < 1 ? 1 : t;
+  }
+  
   this.position = function()
   {
     if(this.mirror){