2 files changed, 58 insertions, 39 deletions

diff --git a/js/lib/geom/sub-path.js b/js/lib/geom/sub-path.js
index 62937461..7e11bb33 100755
--- a/js/lib/geom/sub-path.js
+++ b/js/lib/geom/sub-path.js
@@ -413,19 +413,21 @@ GLSubpath.prototype._checkIntersectionWithSamples = function(startIndex, endInde
     //will assume that the BBox test is performed outside this function
     if (endIndex<startIndex){
         //go from startIndex to the end of the samples
-        endIndex = this._Samples.length;
+        endIndex = this._Samples.length-1;
     }
-    for (var i=startIndex; i<endIndex-1; i++){
+    var retParam = null;
+    for (var i=startIndex; i<endIndex; i++){
         var seg0 = this._Samples[i].slice(0);
         var j=i+1;
         var seg1 = this._Samples[j].slice(0);
         var distToSegment = MathUtils.distPointToSegment(point, seg0, seg1);
         if (distToSegment<=radius){
             var paramDistance = MathUtils.paramPointProjectionOnSegment(point, seg0, seg1); //TODO Optimize! this function was called in distPointToSegment above
-            return this._sampleParam[i] + (this._sampleParam[j] - this._sampleParam[i])*paramDistance;
+            retParam = this._sampleParam[i] + (this._sampleParam[j] - this._sampleParam[i])*paramDistance;
+            break;
         }
     }
-    return null;
+    return retParam;
 };
 
 GLSubpath.prototype._checkIntersection = function(controlPts, beginParam, endParam, point, radius) {
@@ -589,6 +591,10 @@ GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius, testOnly)
     selAnchorIndex = anchorAndRetCode[0];
     retCode = anchorAndRetCode[1];
 
+    if (retCode!== this.SEL_NONE){
+        retCode = retCode | this.SEL_PATH; //ensure that path is also selected if anything else is selected
+    }
+
     //if the location is not close any of the anchors, check if it is close to the curve itself
     if (selAnchorIndex===-1) {
         //first check if the input location is within the bounding box
@@ -603,9 +609,11 @@ GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius, testOnly)
                     [this._Anchors[nextIndex].getPosX(),this._Anchors[nextIndex].getPosY(),this._Anchors[nextIndex].getPosZ()]];
                 var point = [pickX, pickY, pickZ];
                 if (this._isWithinGivenBoundingBox(point, controlPoints, radius)) {
+                    //var intersectParam = this._checkIntersection(controlPoints, 0.0, 1.0, point, radius);
                     var intersectParam = this._checkIntersectionWithSamples(this._anchorSampleIndex[i], this._anchorSampleIndex[nextIndex], point, radius);
-                    if (intersectParam){
+                    if (intersectParam!==null){
                         selAnchorIndex=i;
+                        retCode = retCode | this.SEL_PATH;
                         retParam = intersectParam-i; //make the retParam go from 0 to 1
                         break;
                     }
@@ -614,9 +622,6 @@ GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius, testOnly)
         }//if is within bbox
     }
 
-    if (retCode!== this.SEL_NONE)
-        retCode = retCode | this.SEL_PATH; //ensure that path is also selected if anything else is selected
-    
     if (!testOnly){
         this._selectMode = retCode;
         this._selectedAnchorIndex = selAnchorIndex;
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 50fd97d7..0661c3ea 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -282,6 +282,13 @@ exports.PenTool = Montage.create(ShapeTool, {
                 // Compute the mouse position in local (selected subpath canvas) space
                 var globalPos = hitRec.getScreenPoint();
                 var localMousePos = ViewUtils.globalToLocal(globalPos, this._selectedSubpathCanvas);
+                /*
+                CHECK IF THIS IS CORRECT
+                ViewUtils.pushViewportObj
+                var temp ViewUtils.screenToView(localMousePos[0], localMousePos[1], 0) should return a point in view space of canvas
+                ViewUtils.popViewportObj
+                MathUtils.transformPoint(temp, this._selectedSubpathPlaneMat)
+                */
 
                 //now perform the hit testing
                 var prevSelectedAnchorIndex = this._selectedSubpath.getSelectedAnchorIndex();
@@ -312,8 +319,13 @@ exports.PenTool = Montage.create(ShapeTool, {
                         //if we have selected the first anchor point, and previously had selected the last anchor point, close the path
                         var numAnchors = this._selectedSubpath.getNumAnchors();
                         if (numAnchors>1 && !this._selectedSubpath.getIsClosed() && this._selectedSubpath.getSelectedAnchorIndex()===0 && prevSelectedAnchorIndex === numAnchors-1){
-                            //setting the selection mode to NONE will effectively add a new anchor point at the click location and also give us snapping
-                            whichPoint = this._selectedSubpath.SEL_NONE;
+                            //insert an anchor temporarily that will get removed in the mouse up handler
+                            this._selectedSubpath.addAnchor(new AnchorPoint());
+                            var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                            newAnchor.setPos(localMousePos[0], localMousePos[1], localMousePos[2]);
+                            newAnchor.setPrevPos(localMousePos[0], localMousePos[1], localMousePos[2]);
+                            newAnchor.setNextPos(localMousePos[0], localMousePos[1], localMousePos[2]);
+
                             //set the snap target in case the mouse move handler doesn't get called
                             this._snapTargetIndex = 0;
                         }
@@ -489,7 +501,6 @@ exports.PenTool = Montage.create(ShapeTool, {
                     var globalMousePos = hitRec.getScreenPoint();
                     var localMousePos = ViewUtils.globalToLocal(globalMousePos, drawingCanvas);
 
-
                     //var selAnchorRetCode = this._selectedSubpath.pickAnchor(currMousePos[0], currMousePos[1], currMousePos[2], this._PICK_POINT_RADIUS, false);
                     //var selAnchorRetCode = this._selectedSubpath.pickAnchor(localMousePos[0], localMousePos[1], localMousePos[2], this._PICK_POINT_RADIUS);
                     var selAnchorAndParamAndCode = this._selectedSubpath.pickPath(localMousePos[0], localMousePos[1], localMousePos[2], this._PICK_POINT_RADIUS, true);
@@ -513,7 +524,6 @@ exports.PenTool = Montage.create(ShapeTool, {
                             this.application.ninja.stage.drawingCanvas.style.cursor = cursor;
                         } else if (selAnchorAndParamAndCode[2] & this._selectedSubpath.SEL_PATH) {
                             //change the cursor
-                            STOPPED HERE...why is this case not being hit? 
                             var cursor = "url('images/cursors/penCursors/Pen_plus.png') 5 1, default";
                             this.application.ninja.stage.drawingCanvas.style.cursor = cursor;
                         }
@@ -723,20 +733,28 @@ exports.PenTool = Montage.create(ShapeTool, {
         value: function(){
             var i=0,d=0;
             var currAnchor = null;
-            var localPos = [[0,0,0],[0,0,0],[0,0,0]];
-            //if there is already is a subpath canvas, it means the anchor points are in local space
+            var xAdjustment = snapManager.getStageWidth()*0.5;
+            var yAdjustment = snapManager.getStageHeight()*0.5;
+            var localPos = [[0,0,0,0],[0,0,0,0],[0,0,0,0]];
+            //if there already is a subpath canvas, it means the anchor points are in local space
             //  so convert them to stage world space
             var numAnchors = this._selectedSubpath.getNumAnchors();
             if (this._selectedSubpathCanvas) {
-                var localToStageWorldMat = ViewUtils.getLocalToStageWorldMatrix(this._selectedSubpathCanvas, true, true);
+                //this transformation will take the path points from local space to stage world space
+                // *without* taking into account the transformation applied to this canvas
+                // (this is because we use the center of the bbox to find a place for the canvas)
+                var localToStageWorldMat = ViewUtils.getLocalToStageWorldMatrix(this._selectedSubpathCanvas, true, false);
                 for (i=0;i<numAnchors;i++){
                     //convert this anchor from local to stage world
                     var currAnchor = this._selectedSubpath.getAnchor(i);
-                    localPos[0] = [currAnchor.getPrevX(), currAnchor.getPrevY(), currAnchor.getPrevZ()];
-                    localPos[1] = [currAnchor.getPosX(), currAnchor.getPosY(), currAnchor.getPosZ()];
-                    localPos[2] = [currAnchor.getNextX(), currAnchor.getNextY(), currAnchor.getNextZ()];
+                    localPos[0] = [currAnchor.getPrevX(), currAnchor.getPrevY(), currAnchor.getPrevZ(),1];
+                    localPos[1] = [currAnchor.getPosX(), currAnchor.getPosY(), currAnchor.getPosZ(),1];
+                    localPos[2] = [currAnchor.getNextX(), currAnchor.getNextY(), currAnchor.getNextZ(),1];
                     for (d=0;d<3;d++) {
                         localPos[d] = MathUtils.transformAndDivideHomogeneousPoint(localPos[d], localToStageWorldMat);
+                        //add half the stage width and height to the X and Y coord.
+                        localPos[d][0]+= xAdjustment;
+                        localPos[d][1]+= yAdjustment;
                     }
                     currAnchor.setPrevPos(localPos[0][0],localPos[0][1],localPos[0][2]);
                     currAnchor.setPos(localPos[1][0],localPos[1][1],localPos[1][2]);
@@ -751,28 +769,21 @@ exports.PenTool = Montage.create(ShapeTool, {
             var bboxMax = this._selectedSubpath.getBBoxMax();
 
             //check if the last point added made this canvas is now bigger than the max canvas size
-            var needToRemoveLastPoint = false;
             for (d=0;d<3;d++){
                 if (bboxMax[d]-bboxMin[d]>this._MAX_CANVAS_DIMENSION){
-                   needToRemoveLastPoint = true;
+                    console.log("PEN: Warning! Ignoring last added point because canvas size too large");
+                    this._selectedSubpath.removeAnchor(numAnchors-1);
+                    numAnchors--;
+                    //recompute the bbox of this subpath
+                    this._selectedSubpath.createSamples(true);
+                    bboxMin = this._selectedSubpath.getBBoxMin();
+                    bboxMax = this._selectedSubpath.getBBoxMax();
+                    break;
                 }
             }
-            if (needToRemoveLastPoint){
-                console.log("PEN: Warning! Ignoring last added point because canvas size too large")
-                this._selectedSubpath.removeAnchor(numAnchors-1);
-                numAnchors--;
-                //recompute the bbox of this subpath
-                this._selectedSubpath.createSamples(true);
-                bboxMin = this._selectedSubpath.getBBoxMin();
-                bboxMax = this._selectedSubpath.getBBoxMax();
-            }
+
 
             this._selectedSubpathCanvasCenter = VecUtils.vecInterpolate(3, bboxMin, bboxMax, 0.5);
-            if (this._selectedSubpathCanvas) {
-                //if the canvas does not yet exist, the stage world point already have this stage dimension offset below
-                this._selectedSubpathCanvasCenter[0]+= snapManager.getStageWidth()*0.5;
-                this._selectedSubpathCanvasCenter[1]+= snapManager.getStageHeight()*0.5;
-            }
 
             //update the plane matrix of this subpath by querying the element mediator
             if (this._selectedSubpathCanvas) {
@@ -784,9 +795,9 @@ exports.PenTool = Montage.create(ShapeTool, {
             for (i=0;i<numAnchors;i++){
                 var currAnchor = this._selectedSubpath.getAnchor(i);