3 files changed, 82 insertions, 85 deletions

diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index 89292ad8..f9ed6619 100644
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
@@ -6,7 +6,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
 
-
 ///////////////////////////////////////////////////////////////////////
 // Class GLBrushStroke
 //      representation a sequence points (polyline) created by brush tool.
diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js
index 25b12093..79940e06 100644
--- a/js/helper-classes/RDGE/GLSubpath.js
+++ b/js/helper-classes/RDGE/GLSubpath.js
@@ -155,6 +155,32 @@ function GLSubpath() {
         return retAnchor;
     }
 
+    this.deselectAnchorPoint = function(){
+        this._selectedAnchorIndex = -1;
+    }
+    
+    this.reversePath = function() {
+        var revAnchors = [];
+        var numAnchors = this._Anchors.length;
+        var lastIndex = numAnchors-1;
+        if (lastIndex<0){
+            return; //cannot reverse empty path
+        }
+        for (var i=lastIndex;i>=0;i--) {
+            var newAnchor = new GLAnchorPoint();
+            var oldAnchor = this._Anchors[i];
+            newAnchor.setPos(oldAnchor.getPosX(),oldAnchor.getPosY(),oldAnchor.getPosZ());
+            newAnchor.setPrevPos(oldAnchor.getNextX(),oldAnchor.getNextY(),oldAnchor.getNextZ());
+            newAnchor.setNextPos(oldAnchor.getPrevX(),oldAnchor.getPrevY(),oldAnchor.getPrevZ());
+            revAnchors.push(newAnchor);
+        }
+        if (this._selectedAnchorIndex >= 0){
+            this._selectedAnchorIndex = (numAnchors-1) - this._selectedAnchorIndex;
+        }
+        this._Anchors = revAnchors;
+        this._dirty=true;
+    }
+
     //remove all the anchor points
     this.clearAllAnchors = function () {
         this._Anchors = [];
@@ -220,7 +246,10 @@ function GLSubpath() {
         //check whether the point is within the radius distance from the curve represented as a polyline in _samples
         //return the parametric distance along the curve if there is an intersection, else return null
         //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/3;
+        }
         for (var i=startIndex; i<endIndex; i++){
             var seg0 = Vector.create([this._samples[3*i], this._samples[3*i + 1], this._samples[3*i + 2]]);
             var j=i+1;
@@ -386,6 +415,7 @@ function GLSubpath() {
                 if (this._isWithinBoundingBox(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);
+                    console.log("intersectParam:"+intersectParam);
                     if (intersectParam){
                         retCode = retCode | this.SEL_PATH;
                         retParam = intersectParam-i; //make the retParam go from 0 to 1
@@ -1137,6 +1167,7 @@ function GLSubpath() {
     this.buildBuffers = function () {
         if (this._useCanvasDrawing)
             return;
+
         // get the world
         var world = this.getWorld();
         if (!world) throw ("null world in GLSubpath buildBuffers");
@@ -1368,7 +1399,7 @@ function GLSubpath() {
         ctx.strokeStyle = "black";
         if (this._strokeColor)
             ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor );
-        ctx.fillStyle = "blue";
+        ctx.fillStyle = "white";
         if (this._fillColor)
             ctx.fillStyle = MathUtils.colorToHex( this._fillColor );
         var lineCap = ['butt','round','square'];
@@ -1387,7 +1418,9 @@ function GLSubpath() {
             prevAnchor = currAnchor;
         }
         ctx.stroke();
-        //ctx.fill();
+        if (this._isClosed){
+            ctx.fill();
+        }
 
 
 
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 78344d18..3b03e0e7 100644
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -5,6 +5,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var ShapeTool = require("js/tools/ShapeTool").ShapeTool;
+var ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 var DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase;
 var defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;
 var Montage = require("montage/core/core").Montage;
@@ -187,6 +188,8 @@ exports.PenTool = Montage.create(ShapeTool, {
                             //we have picked the endpoint of this path...reverse the path if necessary
                             if (selAnchorIndex ===0){
                                 //reverse this path
+                                this._selectedSubpath.reversePath();
+                                selAnchorIndex = this._selectedSubpath.getSelectedAnchorIndex();
                             }
                             this._isPickedEndPointInSelectPathMode = true;
                         }
@@ -219,6 +222,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                         }
                     }
                 }
+                //else if (whichPoint === this._selectedSubpath.SEL_NONE) {
                 if (whichPoint === this._selectedSubpath.SEL_NONE) {
                     if (this._entryEditMode !== this.ENTRY_SELECT_PATH) {
                         //add an anchor point to end of the subpath, and make it the selected anchor point
@@ -234,7 +238,18 @@ exports.PenTool = Montage.create(ShapeTool, {
                         }
                     } else {
                         if (this._isPickedEndPointInSelectPathMode){
-                            
+                        //if (0){
+                            //TODO clean up this code...very similar to the code block above
+                            if (!this._selectedSubpath.getIsClosed()) {
+                                this._selectedSubpath.addAnchor(new GLAnchorPoint());
+                                var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
+                                newAnchor.setPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
+                                newAnchor.setPrevPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
+                                newAnchor.setNextPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
+
+                                //set the mode so that dragging will update the next and previous locations
+                                this._editMode = this.EDIT_PREV_NEXT;
+                            }
                         }
                         //if the edit mode was ENTRY_SELECT_PATH and no anchor point was selected, so we should de-select this path and revert to ENTRY_SELECT_NONE
                         //this._entryEditMode = this.ENTRY_SELECT_NONE; //TODO revisit this after implementing code for adding points to any end of selected path
@@ -352,10 +367,10 @@ exports.PenTool = Montage.create(ShapeTool, {
         value: function() {
             if (this._penCanvas!==null) {
                 //obtain the 2D translation of the canvas due to the Selection tool...assuming this is called in Configure
-                var penCanvasLeft = parseFloat(ElementMediator.getProperty(this._penCanvas, "left"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "left"));
+                var penCanvasLeft = parseInt(ElementMediator.getProperty(this._penCanvas, "left"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "left"));
                 var penCanvasTop = parseFloat(ElementMediator.getProperty(this._penCanvas, "top"));//parseFloat(DocumentControllerModule.DocumentController.GetElementStyle(this._penCanvas, "top"));
-                var penCanvasWidth = this._penCanvas.width;
-                var penCanvasHeight = this._penCanvas.height;
+                var penCanvasWidth = parseInt(ElementMediator.getProperty(this._penCanvas, "width"));//this._penCanvas.width;
+                var penCanvasHeight = parseInt(ElementMediator.getProperty(this._penCanvas, "height"));//this._penCanvas.height;
                 var penCanvasOldX = penCanvasLeft + 0.5 * penCanvasWidth;
                 var penCanvasOldY = penCanvasTop + 0.5 * penCanvasHeight;
 
@@ -373,17 +388,20 @@ exports.PenTool = Montage.create(ShapeTool, {
 
     ShowSelectedSubpath:{
         value: function() {
-            var bboxMin = this._selectedSubpath.getBBoxMin();
-            var bboxMax = this._selectedSubpath.getBBoxMax();
-            var bboxWidth = bboxMax[0] - bboxMin[0];
-            var bboxHeight = bboxMax[1] - bboxMin[1];
-            var bboxMid = Vector.create([0.5 * (bboxMax[0] + bboxMin[0]), 0.5 * (bboxMax[1] + bboxMin[1]), 0.5 * (bboxMax[2] + bboxMin[2])]);
-
-            this._selectedSubpath.setCanvasX(bboxMid[0]);
-            this._selectedSubpath.setCanvasY(bboxMid[1]);
-
-            //call render shape with the bbox width and height
-            this.RenderShape(bboxWidth, bboxHeight, this._penPlaneMat, bboxMid, this._penCanvas);
+            if (this._selectedSubpath){
+                this._selectedSubpath.createSamples(); //dirty bit is checked here
+                var bboxMin = this._selectedSubpath.getBBoxMin();
+                var bboxMax = this._selectedSubpath.getBBoxMax();
+                var bboxWidth = bboxMax[0] - bboxMin[0];
+                var bboxHeight = bboxMax[1] - bboxMin[1];
+                var bboxMid = Vector.create([0.5 * (bboxMax[0] + bboxMin[0]), 0.5 * (bboxMax[1] + bboxMin[1]), 0.5 * (bboxMax[2] + bboxMin[2])]);
+
+                this._selectedSubpath.setCanvasX(bboxMid[0]);
+                this._selectedSubpath.setCanvasY(bboxMid[1]);
+
+                //call render shape with the bbox width and height
+                this.RenderShape(bboxWidth, bboxHeight, this._penPlaneMat, bboxMid, this._penCanvas);
+            }
         }
     },
 
@@ -429,11 +447,17 @@ exports.PenTool = Montage.create(ShapeTool, {
                 }
 
                 if (this._isNewPath) {
-                    var strokeSize = 10.0;
+                    var strokeSize = 1.0;//default stroke width