Merge branch 'master' into brushtool

8 files changed, 227 insertions, 143 deletions

diff --git a/js/tools/FillTool.js b/js/tools/FillTool.js
index 66dd9305..e08ec1da 100755
--- a/js/tools/FillTool.js
+++ b/js/tools/FillTool.js
@@ -70,25 +70,32 @@ exports.FillTool = Montage.create(ModifierToolBase, {
     // Called by modifier tool base's HandleLeftButtonDown after updating selection (if needed)
     startDraw: {
         value: function(event) {
+            this.drawData = null;
             this.isDrawing = true;
 
             if(this._canColor && this.application.ninja.selectedElements.length) {
+                var fillInfo = {},
+                    color;
+                if(this.options.useFillColor.checked) {
+                    fillInfo.colorInfo = {};
+                    color = this.options.fill;
+                    if(color && color.color)
+                    {
+                        fillInfo.colorInfo.mode = color.colorMode;
+                        fillInfo.colorInfo.color = color.color;
+                    } else {
+                        fillInfo.colorInfo.mode = "nocolor";
+                        fillInfo.colorInfo.color = null;
+                    }
+                }
 
-                var color = this.options.fill,
-                    colorInfo;
-                if(color && color.color)
-                {
-                    colorInfo = { mode:color.colorMode,
-                                       color:color.color
-                                    };
+                if(this.options.useWebGL.checked) {
+                    fillInfo.webGLInfo = {};
+                    fillInfo.webGLInfo.material = this.options.fillMaterial.value;
                 }
-                else
-                {
-                    colorInfo = { mode:"nocolor",
-                                       color:color.color
-                                    };
+                if(fillInfo.colorInfo || fillInfo.webGLInfo) {
+                    ElementsMediator.setFill(this.application.ninja.selectedElements, fillInfo, "Change", "fillTool");
                 }
-                ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, true, "Change", "fillTool");
             }
         }
     }
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js
index 2c03d133..c5640b10 100755
--- a/js/tools/InkBottleTool.js
+++ b/js/tools/InkBottleTool.js
@@ -65,43 +65,51 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, {
     // Called by modifier tool base's HandleLeftButtonDown after updating selection (if needed)
     startDraw: {
         value: function(event) {
+            this.drawData = null;
             this.isDrawing = true;
 
             if(this._canColor && this.application.ninja.selectedElements.length)
             {
-                var color = this.options.stroke,
-                    colorInfo;
-                if(color && color.color)
-                {
-                    colorInfo = { mode:color.colorMode,
-                                   color:color.color
-                                };
-                }
-                else
-                {
-                    colorInfo = { mode:"nocolor",
-                                   color:color.color
-                                };
+                var strokeInfo = {},
+                    color;
+                if(this.options.useStrokeColor.checked) {
+                    strokeInfo.colorInfo = {};
+                    color = this.options.stroke;
+                    if(color && color.color)
+                    {
+                        strokeInfo.colorInfo.mode = color.colorMode;
+                        strokeInfo.colorInfo.color = color.color;
+                    } else {
+                        strokeInfo.colorInfo.mode = "nocolor";
+                        strokeInfo.colorInfo.color = null;
+                    }
                 }
 
                 if(this.options.useBorderWidth.checked || this.options.useBorderStyle.checked) {
-                    colorInfo.borderInfo = {};
+                    strokeInfo.borderInfo = {};
                     if(this.options.useBorderWidth.checked) {
-                        colorInfo.borderInfo.borderWidth = this.options._borderWidth.value;
-                        colorInfo.borderInfo.borderUnits = this.options._borderWidth.units;
+                        strokeInfo.borderInfo.borderWidth = this.options.borderWidth.value;
+                        strokeInfo.borderInfo.borderUnits = this.options.borderWidth.units;
                     }
                     if(this.options.useBorderStyle.checked) {
-                        colorInfo.borderInfo.borderStyle = this.options._borderStyle.value;
+                        strokeInfo.borderInfo.borderStyle = this.options.borderStyle.value;
                     }
                 }
 
                 if(this.options.useStrokeSize.checked) {
-                    colorInfo.strokeInfo = {};
-                    colorInfo.strokeInfo.strokeSize = this.options._strokeSize.value;
-                    colorInfo.strokeInfo.strokeUnits = this.options._strokeSize.units;
+                    strokeInfo.shapeInfo = {};
+                    strokeInfo.shapeInfo.strokeSize = this.options.strokeSize.value;
+                    strokeInfo.shapeInfo.strokeUnits = this.options.strokeSize.units;
+                }
+
+                if(this.options.useWebGL.checked) {
+                    strokeInfo.webGLInfo = {};
+                    strokeInfo.webGLInfo.material = this.options.strokeMaterial.value;
                 }
 
-                ElementsMediator.setColor(this.application.ninja.selectedElements, colorInfo, false, "Change", "inkBottleTool");
+                if(strokeInfo.colorInfo || strokeInfo.borderInfo || strokeInfo.shapeInfo || strokeInfo.webGLInfo) {
+                    ElementsMediator.setStroke(this.application.ninja.selectedElements, strokeInfo, "Change", "inkBottleTool");
+                }
             }
         }
     }
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index b2b48383..327d0054 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -54,39 +54,46 @@ exports.LineTool = Montage.create(ShapeTool, {
 
     HandleLeftButtonUp: {
         value: function (event) {
-            var slope = this._getSlope(), drawData = this.getDrawingData();
-
-            if(drawData) {
-                var canvas, xAdj = 0, yAdj = 0, w, h;
-                if(!this._useExistingCanvas()) {
-                    if(drawData = this.getDrawingData()) {
-                        // set the dimensions
-                        w = ~~drawData.width;
-                        h = ~~drawData.height;
-                        if(slope === "horizontal") {
-                            h = Math.max(this._strokeSize, 1);
-                        } else if(slope === "vertical") {
-                            w = Math.max(this._strokeSize, 1);
+            var slope = this._getSlope(),
+                canvas,
+                xAdj = 0,
+                yAdj = 0,
+                w,
+                h;
+
+            if(slope) {
+                this.drawData = this.getDrawingData();
+                if(this.drawData) {
+                    w = Math.floor(this.drawData.width);
+                    h = Math.floor(this.drawData.height);
+                    if(!this._useExistingCanvas()) {
+                            // set the dimensions
+                            if(slope === "horizontal") {
+                                h = Math.max(this._strokeSize, 1);
+                                w = Math.max(w, 1);
+                            } else if(slope === "vertical") {
+                                w = Math.max(this._strokeSize, 1);
+                                h = Math.max(h, 1);
+                            } else {
+                                // else make the line's stroke fit inside the canvas by growing the canvas
+                                var theta = Math.atan(slope);
+                                xAdj = Math.abs((this._strokeSize/2)*Math.sin(theta));
+                                yAdj = Math.abs((this._strokeSize/2)*Math.cos(theta));
+
+                                w += ~~(xAdj*2);
+                                h += ~~(yAdj*2);
+                            }
+
+                            canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                            document.application.njUtils.createModelWithShape(canvas, "Line");
+
+                            var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, this.drawData);
+                            this.application.ninja.elementMediator.addElements(canvas, styles);
                         } else {
-                            // else make the line's stroke fit inside the canvas by growing the canvas
-                            var theta = Math.atan(slope);
-                            xAdj = Math.abs((this._strokeSize/2)*Math.sin(theta));
-                            yAdj = Math.abs((this._strokeSize/2)*Math.cos(theta));
-
-                            w += ~~(xAdj*2);
-                            h += ~~(yAdj*2);
-                        }
-
-                        canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
-                        document.application.njUtils.createModelWithShape(canvas, "Line");
-
-                        var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, drawData);
-                        this.application.ninja.elementMediator.addElements(canvas, styles);
-                    } else {
-                        canvas = this._targetedElement;
-                        canvas.elementModel.controller = ShapesController;
-                        if(!canvas.elementModel.shapeModel) {
-                            canvas.elementModel.shapeModel = Montage.create(ShapeModel);
+                            canvas = this._targetedElement;
+                            canvas.elementModel.controller = ShapesController;
+                            if(!canvas.elementModel.shapeModel) {
+                                canvas.elementModel.shapeModel = Montage.create(ShapeModel);
                         }
                     }
                 }
@@ -103,16 +110,18 @@ exports.LineTool = Montage.create(ShapeTool, {
 
     onAddElements: {
         value: function(el) {
-            var drawData, xAdj = 0, yAdj = 0, w, h, slope = this._getSlope();
+            var xAdj = 0, yAdj = 0, w, h, slope = this._getSlope();