2 files changed, 215 insertions, 64 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index 0be378fd..03edef79 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -225,9 +225,11 @@ exports.BrushTool = Montage.create(ShapeTool, {
             this._hasDraw = false;
 
             //finish giving enough info. to the brush stroke
-            this._selectedBrushStroke.setPlaneMatrix(this._brushStrokePlaneMat);
-            this._selectedBrushStroke.setPlaneMatrixInverse(glmat4.inverse(this._brushStrokePlaneMat,[]));
-            this._selectedBrushStroke.setDragPlane(this._draggingPlane);
+            if (this._selectedBrushStroke){
+                this._selectedBrushStroke.setPlaneMatrix(this._brushStrokePlaneMat);
+                this._selectedBrushStroke.setPlaneMatrixInverse(glmat4.inverse(this._brushStrokePlaneMat,[]));
+                this._selectedBrushStroke.setDragPlane(this._draggingPlane);
+            }
 
             //display the previously drawn stroke in a separate canvas
             this.RenderCurrentBrushStroke();
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 10eb03c9..cc8ec394 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -33,10 +33,10 @@ exports.PenTool = Montage.create(ShapeTool, {
     _parentNode: { enumerable: false, value: null, writable: true },
     _toolsPropertiesContainer: { enumerable: false, value: null, writable: true },
 
-    //set this to true if you want to keep making subpaths after closing current subpath (debugging only)
+    //set this to true if you want to keep making subpaths after closing current subpath (debugging only...should always be true)
     _makeMultipleSubpaths: { value: true, writable: true },
 
-    //set this to false if you don't want the mouse move handler being called when the mouse is not down (debugging only)
+    //set this to false if you don't want the mouse move handler being called when the mouse is not down (debugging only...should always be true)
     _trackMouseMoveWhenUp: {value: true, writable: false},
 
     //whether the user has held down the Alt key
@@ -95,6 +95,12 @@ exports.PenTool = Montage.create(ShapeTool, {
     ENTRY_SELECT_PATH: { value: 2, writable: false},
     _entryEditMode: {value: this.ENTRY_SELECT_NONE, writable: true},
 
+    //constants used for determining whether a subtool has been selected (mutually exclusive i.e. cannot be OR-ed)
+    SUBTOOL_NONE: {value: 0, writable: false},
+    SUBTOOL_PENPLUS: {value: 1, writable: false},
+    SUBTOOL_PENMINUS: {value: 2, writable: false},
+    _subtool: {value: this.SUBTOOL_NONE, writable: true},
+
     //constants used for limiting size of the subpath canvas
     _MAX_CANVAS_DIMENSION: {value: 3000, writable: false},
 
@@ -179,6 +185,70 @@ exports.PenTool = Montage.create(ShapeTool, {
         }
     },
 
+    _removeSelectedSubpathAndCanvas:{
+        value: function(removeSelectedSubpath){
+            if (removeSelectedSubpath){
+                this._selectedSubpath.clearAllAnchors(); //perhaps unnecessary
+                this._selectedSubpath = null;
+                if (this._entryEditMode === this.ENTRY_SELECT_PATH){
+                    this._entryEditMode = this.ENTRY_SELECT_NONE;
+                }
+                this._subtool = this.SUBTOOL_NONE;
+            } else {
+                this._selectedSubpath.setCanvas(null);
+            }
+            //clear the canvas
+            this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas();
+
+            //undo/redo...go through ElementController and NJEvent
+            var els = [];
+            ElementController.removeElement(this._selectedSubpathCanvas);
+            els.push(this._selectedSubpathCanvas);
+            NJevent( "elementsRemoved", els );
+            this._selectedSubpathCanvas = null;
+        }
+    },
+
+    _removeSelectedAnchorPoint:{
+        value: function(){
+            this._hoveredAnchorIndex=-1;
+            this._selectedSubpath.removeAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+            if (this._selectedSubpath.getNumAnchors()===1){
+                //convert the remaining anchor point to stage world coords
+                var xDelta = snapManager.getStageWidth()*0.5;
+                var yDelta = snapManager.getStageHeight()*0.5;
+                var anchor = this._selectedSubpath.getAnchor(0);
+                var swPos = ViewUtils.localToStageWorld([anchor.getPosX(),anchor.getPosY(),anchor.getPosZ()], this._selectedSubpathCanvas);
+                anchor.setPos(swPos[0]+xDelta, swPos[1]+yDelta, swPos[2]);
+                swPos = ViewUtils.localToStageWorld([anchor.getPrevX(),anchor.getPrevY(),anchor.getPrevZ()], this._selectedSubpathCanvas);
+                anchor.setPrevPos(swPos[0]+xDelta, swPos[1]+yDelta, swPos[2]);
+                swPos = ViewUtils.localToStageWorld([anchor.getNextX(),anchor.getNextY(),anchor.getNextZ()], this._selectedSubpathCanvas);
+                anchor.setNextPos(swPos[0]+xDelta, swPos[1]+yDelta, swPos[2]);
+            }
+            //clear the canvas
+            this.application.ninja.stage.clearDrawingCanvas();//stageManagerModule.stageManager.clearDrawingCanvas();
+            var removeSelectedSubpath=true;
+            var newNumAnchors = this._selectedSubpath.getNumAnchors();
+            if (newNumAnchors>1) {
+                this._selectedSubpath.createSamples(false);
+                this.PrepareSelectedSubpathForRendering();
+                this.ShowSelectedSubpath();
+            }
+            else {
+                //since we have 0 or 1 anchors, we will remove the selected canvas (as the path does not exist)
+                if (newNumAnchors===0){
+                    removeSelectedSubpath = true;
+                } else{
+                    removeSelectedSubpath = false; //don't remove the selected subpath if there is still one anchor
+                }
+                this._removeSelectedSubpathAndCanvas(removeSelectedSubpath);
+            }
+            if (!removeSelectedSubpath){
+                this.DrawSubpathAnchors(this._selectedSubpath);
+            }
+        }
+    },
+
     // **********************************************************************************************************
     //  Mouse down handler
     //  IF the selected subpath is null, it means we're going to start a new subpath
@@ -220,6 +290,11 @@ exports.PenTool = Montage.create(ShapeTool, {
             if (this._entryEditMode !== this.ENTRY_SELECT_PATH && this._selectedSubpath && this._selectedSubpath.getIsClosed() && this._makeMultipleSubpaths) {
                 this._selectedSubpath = null;
             }
+
+            if (this._subtool !== this.SUBTOOL_NONE && this._selectedSubpath===null) {
+                //do nothing because the pen plus and pen minus subtools need a selected subpath
+                return;
+            }
             if (this._selectedSubpath === null) {
                 this._selectedSubpath = new SubPath();
                 this._selectedSubpathCanvas = null;
@@ -255,7 +330,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                     colorArray = [1,1,1,0];
                 }
                 this._selectedSubpath.setFillColor(colorArray);
-            }
+            } //if the selectedSubpath was null and needed to be constructed
 
             //build the hit record for the current mouse position (on the stage or the plane of the path canvas)
             var hitRec = this.getHitRecord(event.pageX, event.pageY, false);
@@ -273,14 +348,36 @@ exports.PenTool = Montage.create(ShapeTool, {
                 var swMousePos = hitRec.calculateStageWorldPoint();
                 swMousePos[0]+= snapManager.getStageWidth()*0.5; swMousePos[1]+= snapManager.getStageHeight()*0.5;
 
-                this._selectedSubpath.addAnchor(new AnchorPoint());
-                var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
-                newAnchor.setPos(swMousePos[0], swMousePos[1], swMousePos[2]);
-                newAnchor.setPrevPos(swMousePos[0], swMousePos[1], swMousePos[2]);
-                newAnchor.setNextPos(swMousePos[0], swMousePos[1], swMousePos[2]);
-                //set the mode so that dragging will update the next and previous locations
-                this._editMode = this.EDIT_PREV_NEXT;
-            }
+                //check if the mouse click location is close to the existing anchor
+                var indexAndCode = this._selectedSubpath.pickAnchor(swMousePos[0], swMousePos[1], swMousePos[2], this._PICK_POINT_RADIUS);
+                if (indexAndCode[0]>=0){
+                    //the anchor point was hit, so we do not add another anchor
+                    switch(indexAndCode[1]){
+                        case this._selectedSubpath.SEL_ANCHOR:
+                            this._editMode = this.EDIT_ANCHOR;
+                            break;
+                        case this._selectedSubpath.SEL_PREV:
+                            this._editMode = this.EDIT_PREV;
+                            break;
+                        case this._selectedSubpath.SEL_NEXT:
+                            this._editMode = this.EDIT_NEXT;
+                            break;
+                        default:
+                            this._editMode = this.EDIT_ANCHOR;
+                            console.log("WARNING picked anchor point with incorrect mode");
+                            break;
+                    }
+                    
+                } else {
+                    this._selectedSubpath.addAnchor(new AnchorPoint());
+                    var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                    newAnchor.setPos(swMousePos[0], swMousePos[1], swMousePos[2]);
+                    newAnchor.setPrevPos(swMousePos[0], swMousePos[1], swMousePos[2]);
+                    newAnchor.setNextPos(swMousePos[0], swMousePos[1], swMousePos[2]);
+                    //set the mode so that dragging will update the next and previous locations
+                    this._editMode = this.EDIT_PREV_NEXT;
+                }
+            } //if we have not yet created a canvas for this path
 
             //the selected subpath has a canvas, so test within that canvas' space
             else
@@ -311,6 +408,11 @@ exports.PenTool = Montage.create(ShapeTool, {
                 if (whichPoint !== this._selectedSubpath.SEL_NONE){
                     //if we hit the anchor point itself
                     if (whichPoint & this._selectedSubpath.SEL_ANCHOR) {
+                        if (this._subtool===this.SUBTOOL_PENMINUS){
+                            //remove the selected anchor, similar to HandleDelete
+                            this._removeSelectedAnchorPoint();
+                            return;
+                        }
                         //if we're in ENTRY_SELECT_PATH mode AND we have not yet clicked on the endpoint AND if we have now clicked on the endpoint
                         if (this._entryEditMode === this.ENTRY_SELECT_PATH && this._isPickedEndPointInSelectPathMode === false){
                             var selAnchorIndex = this._selectedSubpath.getSelectedAnchorIndex();
@@ -416,6 +518,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                     "url('images/cursors/penCursors/Pen_newPath.png') 5 1, default";
             }
 
+
             if (!this._selectedSubpath ){
                 return; //nothing to do in case no subpath is selected
             }
@@ -454,19 +557,18 @@ exports.PenTool = Montage.create(ShapeTool, {
                     else if (this._editMode & this.EDIT_PREV) {
                         localTranslation = VecUtils.vecSubtract(3, localMousePos, selAnchorPos[0]);
                         selAnchor.translatePrev(localTranslation[0], localTranslation[1], localTranslation[2]);