16 files changed, 1149 insertions, 733 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 4fb0a327..fe5f839c 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -382,6 +382,12 @@ NinjaCvsRt.GLRuntime = Object.create(Object.prototype, {
                     obj = Object.create(NinjaCvsRt.RuntimeSubPath, {_materials: { value:[], writable:true}});
                     obj.importJSON (jObj );
                     break;
+
+                case 6:     //brushstroke (created by brush tool)
+                    obj = Object.create(NinjaCvsRt.RuntimeBrushStroke, {_materials: { value:[], writable:true}});
+                    obj.importJSON (jObj );
+                    break;
+
                 default:
                     throw new Error( "Attempting to load unrecognized object type: " + type );
                     break;
@@ -524,6 +530,7 @@ NinjaCvsRt.RuntimeGeomObj = Object.create(Object.prototype, {
     GEOM_TYPE_LINE: { value: 3, writable: false },
     GEOM_TYPE_PATH: { value: 4, writable: false },
     GEOM_TYPE_CUBIC_BEZIER: { value: 5, writable: false },
+    GEOM_TYPE_BRUSH_STROKE: { value: 6, writable: false },
     GEOM_TYPE_UNDEFINED: { value: -1, writable: false },
 
     ///////////////////////////////////////////////////////////////////////
@@ -2042,8 +2049,251 @@ NinjaCvsRt.RuntimeSubPath = Object.create(NinjaCvsRt.RuntimeGeomObj, {
         }
     }
 });
+
 // **************************************************************************
 // END runtime for the pen tool path
 // **************************************************************************
 
 
+// ***************************************************************************
+// runtime for brush tool brush stroke
+// ***************************************************************************
+
+NinjaCvsRt.RuntimeBrushStroke = Object.create(NinjaCvsRt.RuntimeGeomObj, {
+    // array of brush stroke points
+    _LocalPoints: { value: null, writable: true },
+    _OrigLocalPoints: {value: null, writable: true},
+
+    _strokeWidth: {value: 0, writable: true},
+    _strokeColor: {value: 0, writable: true},
+    _strokeHardness: {value: 0, writable: true},
+    _strokeUseCalligraphic : {value: 0, writable: true},
+    _strokeAngle : {value: 0, writable: true},
+
+    //stroke smoothing properties
+    _strokeDoSmoothing: {value: 0, writable: true},
+    _strokeAmountSmoothing : {value: 0, writable: true},
+
+    geomType: {
+        value: function () {
+            return this.GEOM_TYPE_BRUSH_STROKE;
+        }
+    },
+
+    _copyCoordinates3D: {
+        value: function(srcCoord, destCoord){
+            var i=0;
+            var numPoints = srcCoord.length;
+            for (i=0;i<numPoints;i++){
+                destCoord[i] = [srcCoord[i][0],srcCoord[i][1],srcCoord[i][2]];
+            }
+        }
+    },
+
+    _doSmoothing: {
+        value: function() {
+            var numPoints = this._LocalPoints.length;
+            if (this._strokeDoSmoothing && numPoints>1) {
+                this._copyCoordinates3D(this._OrigLocalPoints, this._LocalPoints);
+                //iterations of Laplacian smoothing (setting the points to the average of their neighbors)
+                var numLaplacianIterations = this._strokeAmountSmoothing;
+                for (var n=0;n<numLaplacianIterations;n++){
+                    var newPoints = this._LocalPoints.slice(0); //I think this performs a copy by reference, which would make the following a SOR step
+                    for (var i=1;i<numPoints-1;i++) {
+                        var avgPos = [  0.5*(this._LocalPoints[i-1][0] + this._LocalPoints[i+1][0]),
+                            0.5*(this._LocalPoints[i-1][1] + this._LocalPoints[i+1][1]),
+                            0.5*(this._LocalPoints[i-1][2] + this._LocalPoints[i+1][2])] ;
+                        newPoints[i] = avgPos;
+                    }
+                    this._LocalPoints = newPoints.slice(0);
+                }
+            }
+        }
+    },
+
+    importJSON: {
+        value: function(jo) {
+            if (this.geomType()!== jo.geomType){
+                return;
+            }
+            //the geometry for this object
+            this._LocalPoints = jo.localPoints.slice(0);
+            this._OrigLocalPoints = jo.origLocalPoints.slice(0);
+            this._copyCoordinates3D(jo.localPoints, this._LocalPoints); //todo is this necessary in addition to the slice(0) above?
+            this._copyCoordinates3D(jo.origLocalPoints, this._OrigLocalPoints); //todo <ditto>
+
+            //stroke appearance properties
+            this._strokeWidth = jo.strokeWidth;
+            this._strokeColor = jo.strokeColor;
+            this._strokeHardness = jo.strokeHardness;
+            this._strokeUseCalligraphic = jo.strokeUseCalligraphic;
+            this._strokeAngle = jo.strokeAngle;
+
+            //stroke smoothing properties
+            this._strokeDoSmoothing = jo.strokeDoSmoothing;
+            this._strokeAmountSmoothing = jo.strokeAmountSmoothing;
+
+            this._doSmoothing();      //after smoothing, the stroke is ready to be rendered
+        }
+    },
+
+    //buildColor returns the fillStyle or strokeStyle for the Canvas 2D context
+    buildColor: {
+        value: function(ctx,   //the 2D rendering context (for creating gradients if necessary)
+                 ipColor,      //color string, also encodes whether there's a gradient and of what type
+                 w,            //width of the region of color
+                 h,            //height of the region of color
+                 lw)           //linewidth (i.e. stroke width/size)
+        {
+            if (ipColor.gradientMode){
+                var position, gradient, cs, inset; //vars used in gradient calculations
+                inset = Math.ceil( lw ) - 0.5;
+
+                if(ipColor.gradientMode === "radial") {
+                    var ww = w - 2*lw,  hh = h - 2*lw;
+                    gradient = ctx.createRadialGradient(w/2, h/2, 0, w/2, h/2, Math.max(ww, hh)/2);
+                } else {
+                    gradient = ctx.createLinearGradient(inset, h/2, w-inset, h/2);
+                }
+                var colors = ipColor.color;
+
+                var len = colors.length;
+                for(n=0; n<len; n++) {
+                    position = colors[n].position/100;
+                    cs = colors[n].value;
+                    gradient.addColorStop(position, "rgba(" + cs.r + "," + cs.g + "," + cs.b + "," + cs.a + ")");
+                }
+                return gradient;
+            } else {
+                var c = "rgba(" + 255*ipColor[0] + "," + 255*ipColor[1] + "," + 255*ipColor[2] + "," + ipColor[3] + ")";
+                return c;
+            }
+        }
+    },
+
+    render: {
+        value: function() {
+            //vars for gradient code
+            var w,h,useBuildColor=false;
+
+            // get the world
+            var world = this.getWorld();
+            if (!world)  {
+                throw( "null world in brush stroke render" );
+                return;
+            } else {
+
+                if (this._strokeColor.gradientMode){
+                    useBuildColor = true;
+                }
+                //vars used for the gradient computation in buildColor
+                w = world.getViewportWidth();
+                h = world.getViewportHeight();
+            }
+            // get the context
+            var ctx = world.get2DContext();
+            if (!ctx)  {
+                throw( "null world in brush stroke render" );
+                return;
+            }
+
+            ctx.save();
+
+            //**** BEGIN RENDER CODE BLOCK ****
+            var points = this._LocalPoints;
+            var numPoints = points.length;
+            var tempP, p;
+            if (this._strokeUseCalligraphic) {
+                //build the stamp for the brush stroke
+                var t=0;
+                var numTraces = this._strokeWidth;
+                var halfNumTraces = numTraces*0.5;
+                var opaqueRegionHalfWidth = 0.5*this._strokeHardness*numTraces*0.01; //the 0.01 is to convert the strokeHardness from [0,100] to [0,1]
+                var maxTransparentRegionHalfWidth = halfNumTraces-opaqueRegionHalfWidth;
+
+                //build an angled (calligraphic) brush stamp
+                var deltaDisplacement = [Math.cos(this._strokeAngle),Math.sin(this._strokeAngle)];
+                deltaDisplacement = this.vecNormalize(2, deltaDisplacement, 1);
+                var startPos = [-halfNumTraces*deltaDisplacement[0],-halfNumTraces*deltaDisplacement[1]];
+
+                var brushStamp = [];
+                for (t=0;t<numTraces;t++){
+                    var brushPt = [startPos[0]+t*deltaDisplacement[0], startPos[1]+t*deltaDisplacement[1]];
+                    brushStamp.push(brushPt);
+                }
+
+                ctx.lineJoin="bevel";
+                ctx.lineCap="butt";
+                ctx.globalCompositeOperation = 'source-over';
+                ctx.globalAlpha = this._strokeColor[3];
+
+                for (t=0;t<numT