5 files changed, 75 insertions, 146 deletions

diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 71ed62a0..3d24f76e 100644
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -802,19 +802,21 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
     getAxisAngleBetween3DVectors: {
         value: function (vec1, vec2, axis) {
             //compute magnitudes of the vectors
-            var mag1 = VecUtils.vecMag(3, vec1);
-            var mag2 = VecUtils.vecMag(3, vec2);
-
-            if (mag1 < this.EPSILON || mag2 < this.EPSILON) {
-                return 0; //if angle 0 is returned nothing from this function should be used
-            }
+            var v1n = VecUtils.vecNormalize(3, vec1, 1.0);
+            var v2n = VecUtils.vecNormalize(3, vec2, 1.0);
             //angle between the vectors (acos for now...)
-            var angle = Math.acos(VecUtils.vecDot(3, vec1, vec2) / (mag1 * mag2));
+            var angle = Math.acos(VecUtils.vecDot(3, v1n, v2n));
             if (Math.abs(angle) < this.EPSILON) {
                 return 0;
             }
+            //TODO testing...remove this block
+            console.log("getAxisAngleBetween3DVectors Angle: "+angle);
+            if (isNaN(angle)){
+                console.log("getAxisAngleBetween3DVectors Angle is NaN");
+            }
+            //TODO end testing block
             //optionally, if axis is provided, create the axis of rotation as well
-            var rotAxis = VecUtils.vecCross(3, vec1, vec2);
+            var rotAxis = VecUtils.vecCross(3, v1n, v2n);
             rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);
             axis[0] = rotAxis[0];
             axis[1] = rotAxis[1];
diff --git a/js/helper-classes/RDGE/GLAnchorPoint.js b/js/helper-classes/RDGE/GLAnchorPoint.js
index 6b4af072..716f59d4 100644
--- a/js/helper-classes/RDGE/GLAnchorPoint.js
+++ b/js/helper-classes/RDGE/GLAnchorPoint.js
@@ -55,6 +55,11 @@ GLAnchorPoint.prototype.setNextFromPrev = function () {
 
 //translate the next point from the translation that was applied to the prev. point
 GLAnchorPoint.prototype.translateNextFromPrev = function (tx, ty, tz) {
+    //do nothing if the total translation is zero
+    var totalTransSq = (tx*tx) + (ty*ty) + (tz*tz);
+    if (totalTransSq < 0.0000001)
+        return;
+    
     // *** compute the rotation of the prev vector ***
     var oldP = Vector.create([this._prevX + tx - this._x, this._prevY + ty - this._y, this._prevZ + tz - this._z]);
     var newP = Vector.create([this._prevX - this._x, this._prevY - this._y, this._prevZ - this._z]);
@@ -71,6 +76,7 @@ GLAnchorPoint.prototype.translateNextFromPrev = function (tx, ty, tz) {
 
     //TEMP for some situations the axis angle computation returns NaNs
     if (isNaN(newN[0]) || isNaN(newN[1]) || isNaN(newN[2])) {
+        console.log("NaN in translateNextFromPrev");
         return;
     }
     //end TEMP
@@ -80,6 +86,11 @@ GLAnchorPoint.prototype.translateNextFromPrev = function (tx, ty, tz) {
 }
 //translate the next point from the translation that was applied to the prev. point
 GLAnchorPoint.prototype.translatePrevFromNext = function (tx, ty, tz) {
+    //do nothing if the total translation is zero
+    var totalTransSq = (tx*tx) + (ty*ty) + (tz*tz);
+    if (totalTransSq < 0.0000001)
+        return;
+        
     // *** compute the rotation of the next vector ***
     var oldN = Vector.create([this._nextX + tx - this._x, this._nextY + ty - this._y, this._nextZ + tz - this._z]);
     var newN = Vector.create([this._nextX - this._x, this._nextY - this._y, this._nextZ - this._z]);
diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index 552545f0..fdf1595c 100644
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
@@ -4,7 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-// Todo: This shoudl be converted to a module
+// Todo: This entire class should be converted to a module
 var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
 
 ///////////////////////////////////////////////////////////////////////
@@ -140,6 +140,10 @@ function GLBrushStroke() {
         this._dirty = false;
     }
 
+    this.buildBuffers = function () {
+        return; //no need to do anything for now
+    }//buildBuffers()
+
     //render
     //  specify how to render the subpath in Canvas2D
     this.render = function () {
diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js
index 383194d4..a14fdda0 100644
--- a/js/helper-classes/RDGE/GLSubpath.js
+++ b/js/helper-classes/RDGE/GLSubpath.js
@@ -4,7 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-// Todo: This shoudl be converted to a module
+// Todo: This entire class should be converted to a module
 var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
 
 
@@ -163,6 +163,7 @@ function GLSubpath() {
         }
         */
 
+
         var numPoints = this._samples.length/3;
         ctx.moveTo(this._samples[0]-bboxMin[0],this._samples[1]-bboxMin[1]);
         for (var i=0;i<numPoints;i++){
@@ -172,6 +173,7 @@ function GLSubpath() {
             ctx.lineTo(this._samples[0]-bboxMin[0],this._samples[1]-bboxMin[1]);
             ctx.fill();
         }
+
         ctx.stroke();
         ctx.restore();
     } //render()
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 5b48d3c9..9a69b53d 100644
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -37,7 +37,6 @@ exports.PenTool = Montage.create(ShapeTool, {
     _currentY: { value: 0, writable: true },
 
     //the subpaths are what is displayed on the screen currently, with _selectedSubpath being the active one currently being edited
-    _subpaths: { value: [], writable: true },
     _selectedSubpath: { value: null, writable: true },
     _makeMultipleSubpaths: { value: true, writable: true },    //set this to true if you want to keep making subpaths after closing current subpath
 
@@ -90,39 +89,29 @@ exports.PenTool = Montage.create(ShapeTool, {
     ENTRY_SELECT_PATH: { value: 2, writable: false},
     _entryEditMode: {value: this.ENTRY_SELECT_NONE, writable: true},
     
-    //  ******** Logic for selection  *******
-    //  (update if you change functionality!) 
-    //      NOTE: this is out of date...needs to be updated
-    //
-    //  Start by setting edit mode to EDIT_NONE
-    //
-    //  DOUBLE_CLICK (Left mouse button only):
-    //
-    //
-    //  SINGLE_CLICK (Left mouse button only):
-    //  If LeftClick selects an anchor point
-    //      append EDIT_ANCHOR mode
-    //  If LeftClick selects a previous point of selected anchor
-    //      append EDIT_PREV mode
-    //  If LeftClick selects a next point of selected anchor
-    //      append EDIT_NEXT mode 
-    //
-
-    // ********* Logic for editing *******
-    //  (update if you change functionality!)
-    //      NOTE: this is out of date...needs to be updated
-    //
-    //  Start by computing mouse disp
-    //
-    //  If EDIT_PREV_NEXT mode
-    //      add disp to next and mirror it to prev
-    //  ELSE
-    //      If EDIT_ANCHOR (or _PREV, _NEXT)
-    //          map displacement to anchor (similarly to prev and next)
-    //
-    // 
 
 
+    _getUnsnappedPosition: {
+        value: function(x,y){
+            var elemSnap = snapManager.elementSnapEnabled();
+            var gridSnap = snapManager.gridSnapEnabled();
+            var alignSnap = snapManager.snapAlignEnabled();
+
+            snapManager.enableElementSnap(false);
+            snapManager.enableGridSnap(false);
+            snapManager.enableSnapAlign(false);
+
+            var point = webkitConvertPointFromPageToNode(this.application.ninja.stage.canvas, new WebKitPoint(x,y));
+            var unsnappedpos = DrawingToolBase.getHitRecPos(snapManager.snap(point.x, point.y, false));
+
+            snapManager.enableElementSnap(elemSnap);
+            snapManager.enableGridSnap(gridSnap);
+            snapManager.enableSnapAlign(alignSnap);
+
+            return unsnappedpos;
+        }
+    },
+
     ShowToolProperties: {
         value: function () {
             this._penView = PenView.create();
@@ -153,7 +142,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             this._isNewPath = false;
 
             //add an anchor point by computing position of mouse down
-            var mouseDownPos = this.getMouseDownPos();
+            var mouseDownPos = this._getUnsnappedPosition(event.pageX, event.pageY); //this.getMouseDownPos();
             if (mouseDownPos) {
                 //if we had closed the selected subpath previously, or if we have not yet started anything, create a subpath