3 files changed, 419 insertions, 149 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index e348f5e8..5a2fabe8 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -942,7 +942,7 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
 {
         var type = jObj.type;
     var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
-
+    var SubPath = require("js/lib/geom/sub-path").SubPath;
         var obj;
         switch (type)
         {
@@ -961,6 +961,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj )
             obj.importJSON( jObj );
             break;
 
+        case 5:     //cubic bezier
+            obj = new SubPath();
+            obj.importJSON(jObj);
+            break;
+
         case 6:     //brush stroke
             obj = new BrushStroke();
             obj.importJSON(jObj);
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 22209815..2a751a89 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -413,7 +413,7 @@ var BrushStroke = function GLBrushStroke() {
             this._LocalPoints[i][1]+= halfheight;
 
             //store the original points
-            this._OrigLocalPoints   .push([this._LocalPoints[i][0],this._LocalPoints[i][1],this._LocalPoints[i][2]]);
+            this._OrigLocalPoints.push([this._LocalPoints[i][0],this._LocalPoints[i][1],this._LocalPoints[i][2]]);
         }
         //update the bbox with the same adjustment as was made for the local points above
         this._BBoxMax[0]+= halfwidth;this._BBoxMin[0]+= halfwidth;
@@ -541,6 +541,10 @@ var BrushStroke = function GLBrushStroke() {
         var bboxWidth = bboxMax[0] - bboxMin[0];
         var bboxHeight = bboxMax[1] - bboxMin[1];
 
+        if (!this._canvas){
+            //set the canvas by querying the world
+            this._canvas = this.getWorld().getCanvas();
+        }
         if (this._canvas) {
             var newLeft = Math.round(this._stageWorldCenter[0] - 0.5 * bboxWidth);
             var newTop = Math.round(this._stageWorldCenter[1] - 0.5 * bboxHeight);
@@ -550,7 +554,7 @@ var BrushStroke = function GLBrushStroke() {
 
             CanvasController.setProperty(this._canvas, "width", bboxWidth+"px");
             CanvasController.setProperty(this._canvas, "height", bboxHeight+"px");
-            this._canvas.elementModel.shapeModel.GLWorld.setViewportFromCanvas(this._canvas);
+            //this._canvas.elementModel.shapeModel.GLWorld.setViewportFromCanvas(this._canvas);
         }
 
 
@@ -662,8 +666,8 @@ var BrushStroke = function GLBrushStroke() {
         this._copyCoordinates3D(this._OrigLocalPoints, retObject.origLocalPoints); //todo <ditto>
 
         retObject.stageWorldCenter = [this._stageWorldCenter[0],this._stageWorldCenter[1],this._stageWorldCenter[2]];
-        retObject.planeMat = [this._planeMat[0],this._planeMat[1],this._planeMat[2],this._planeMat[3]];
-        retObject.planeMatInv = [this._planeMatInv[0],this._planeMatInv[1],this._planeMatInv[2],this._planeMatInv[3]];
+        retObject.planeMat = this._planeMat;
+        retObject.planeMatInv = this._planeMatInv;
         retObject.dragPlane = [this._dragPlane[0],this._dragPlane[1],this._dragPlane[2],this._dragPlane[3]];
 
         //stroke appearance properties
@@ -691,8 +695,8 @@ var BrushStroke = function GLBrushStroke() {
         this._copyCoordinates3D(jo.origLocalPoints, this._OrigLocalPoints); //todo <ditto>
 
         this._stageWorldCenter = [jo.stageWorldCenter[0],jo.stageWorldCenter[1],jo.stageWorldCenter[2]];
-        this._planeMat = [jo.planeMat[0], jo.planeMat[1],jo.planeMat[2],jo.planeMat[3]];
-        this._planeMatInv = [jo.planeMatInv[0],jo.planeMatInv[1],jo.planeMatInv[2],jo.planeMatInv[3]];
+        this._planeMat = jo.planeMat;
+        this._planeMatInv = jo.planeMatInv;
         this._dragPlane = [jo.dragPlane[0],jo.dragPlane[1],jo.dragPlane[2],jo.dragPlane[3]];
 
         //stroke appearance properties
diff --git a/js/lib/geom/sub-path.js b/js/lib/geom/sub-path.js
index 7046673e..bca4e1c5 100755
--- a/js/lib/geom/sub-path.js
+++ b/js/lib/geom/sub-path.js
@@ -12,6 +12,7 @@ var AnchorPoint =   require("js/lib/geom/anchor-point").AnchorPoint;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 // TODO Those function do not seems to be used. We should remove them
+/*
 function SubpathOffsetPoint(pos, mapPos) {
     this.Pos = [pos[0],pos[1],pos[2]];
     this.CurveMapPos = [mapPos[0], mapPos[1], mapPos[2]];
@@ -33,7 +34,7 @@ function sortNumberDescending(a,b){
 function SegmentIntersections(){
     this.paramArray = [];
 }
-
+*/
 ///////////////////////////////////////////////////////////////////////
 // Class GLSubpath
 //      representation a sequence of cubic bezier curves.
@@ -49,27 +50,34 @@ var GLSubpath = function GLSubpath() {
     this._BBoxMax = [0, 0, 0];
     this._isClosed = false;
 
-    this._samples = [];                 //polyline representation of this curve
-    this._sampleParam = [];            //parametric distance of samples, within [0, N], where N is # of Bezier curves (=# of anchor points if closed, =#anchor pts -1 if open)
+    this._samples = [];                 //polyline representation of this curve in stage world space
+    this._sampleParam = [];             //parametric distance of samples, within [0, N], where N is # of Bezier curves (=# of anchor points if closed, =#anchor pts -1 if open)
     this._anchorSampleIndex = [];       //index within _samples corresponding to anchor points
-    
+
+    this._LocalPoints = [];             //polyline representation of this curve in canvas space
+    this._LocalBBoxMin = [0,0,0];       //bbox min point of _LocalPoints
+    this._LocalBBoxMax = [0,0,0];       //bbox max point of _LocalPoints
+
     this._UnprojectedAnchors = [];
 
     //initially set the _dirty bit so we will construct samples
     this._dirty = true;
 
+    //initially set the local dirty bit so we will construct local coordinates
+    this._isLocalDirty = true;
+
     //whether or not to use the canvas drawing to stroke/fill
     this._useCanvasDrawing = true;
 
     //the canvas that will draw this subpath
     this._canvas = null;
     
-    //the X and Y location of this subpath's canvas in stage world space of Ninja
-    this._canvasX = 0;
-    this._canvasY = 0;
+    //the top left location of this subpath's canvas in screen space
+    this._canvasLeft = 0;
+    this._canvasTop = 0;
 
     //stroke information
-    this._strokeWidth = 0.0;
+    this._strokeWidth = 1.0;
     this._strokeColor = [0.4, 0.4, 0.4, 1.0];
     this._strokeMaterial = null
     this._strokeStyle = "Solid";
@@ -87,6 +95,7 @@ var GLSubpath = function GLSubpath() {
     this._planeMat = null;
     this._planeMatInv = null;
     this._planeCenter = null;
+    this._dragPlane = null;
 
     //used to query what the user selected, OR-able for future extensions
     this.SEL_NONE = 0;          //nothing was selected
@@ -109,42 +118,59 @@ var GLSubpath = function GLSubpath() {
         // return; //no need to do anything for now
     };
 
+    this._offsetLocalCoord = function(deltaW, deltaH){
+        var numPoints = this._LocalPoints.length;
+        for (var i=0;i<numPoints;i++) {
+            this._LocalPoints[i][0]+= deltaW;
+            this._LocalPoints[i][1]+= deltaH;
+        }
+    };
     //render
     //  specify how to render the subpath in Canvas2D
     this.render = function () {
         // get the world
         var world = this.getWorld();
         if (!world)  throw( "null world in subpath render" );
-
-         // get the context
+        if (!this._canvas){
+            //set the canvas by querying the world
+            this._canvas = this.getWorld().getCanvas();
+        }
+        // get the context
         var ctx = world.get2DContext();
-        if (!ctx)  throw ("null context in subpath render")
+        if (!ctx)  throw ("null context in subpath render");
 
         var numAnchors = this.getNumAnchors();
         if (numAnchors === 0) {
             return; //nothing to do for empty paths
         }
+        var useLocalCoord = true;
+        this.createSamples(); //dirty bit checked in this function...will generate a polyline representation
 
-        ctx.save();
+        //build the coordinates of the samples in 2D (canvas) space (localDirty bit checked in buildLocalCoord
+        this.buildLocalCoord();
 
-        this.createSamples(); //dirty bit checked in this function...will generate a polyline representation
-        var bboxMin = this.getBBoxMin();
-        var bboxMax = this.getBBoxMax();
-        var bboxWidth = bboxMax[0] - bboxMin[0];
-        var bboxHeight = bboxMax[1] - bboxMin[1];
-        var bboxMid = [0.5 * (bboxMax[0] + bboxMin[0]), 0.5 * (bboxMax[1] + bboxMin[1]), 0.5 * (bboxMax[2] + bboxMin[2])];
-
-        if (this._canvas) {
+        //figure the size of the area we will draw into
+        var bboxWidth=0, bboxHeight=0;
+        if (useLocalCoord){
+            bboxWidth = this._LocalBBoxMax[0] - this._LocalBBoxMin[0];
+            bboxHeight = this._LocalBBoxMax[1] - this._LocalBBoxMin[1];