when selecting anchor points, first check if the selected anchor position is close enough

1 files changed, 98 insertions, 70 deletions

diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js
index c4ca1b20..9b6ae917 100644
--- a/js/helper-classes/RDGE/GLSubpath.js
+++ b/js/helper-classes/RDGE/GLSubpath.js
@@ -433,17 +433,111 @@ GLSubpath.prototype.pickAnchor = function (pickX, pickY, pickZ, radius) {
     var retCode = this.SEL_NONE;
     var radSq = radius * radius;
     var minDistance = Infinity;
-    for (var i = 0; i < numAnchors; i++) {
-        var distSq = this._Anchors[i].getDistanceSq(pickX, pickY, pickZ);
+    //check if the clicked location is close to the currently selected anchor position
+    if (this._selectedAnchorIndex>=0 && this._selectedAnchorIndex<this._Anchors.length){
+        var distSq = this._Anchors[this._selectedAnchorIndex].getDistanceSq(pickX, pickY, pickZ);
         //check the anchor point
         if (distSq < minDistance && distSq < radSq) {
-            selAnchorIndex = i;
+            selAnchorIndex = this._selectedAnchorIndex;
             minDistance = distSq;
+            retCode = retCode | this.SEL_ANCHOR;
         }
-    }//for every anchor i
+    }
+    //now check if the click location is close to any anchor position
+    if (selAnchorIndex===-1) {
+        for (var i = 0; i < numAnchors; i++) {
+            var distSq = this._Anchors[i].getDistanceSq(pickX, pickY, pickZ);
+            //check the anchor point
+            if (distSq < minDistance && distSq < radSq) {
+                selAnchorIndex = i;
+                minDistance = distSq;
+            }
+        }//for every anchor i
+    }
     return selAnchorIndex;
 }
 
+
+//pick the path point closest to the specified location, return null if some anchor point (or its handles) is within radius, else return the parameter distance
+GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius) {
+    var numAnchors = this._Anchors.length;
+    var selAnchorIndex = -1;
+    var retCode = this.SEL_NONE;
+    var radSq = radius * radius;
+    var minDistance = Infinity;
+    //check if the clicked location is close to the currently selected anchor position
+    if (this._selectedAnchorIndex>=0 && this._selectedAnchorIndex<this._Anchors.length){
+        var distSq = this._Anchors[this._selectedAnchorIndex].getDistanceSq(pickX, pickY, pickZ);
+        //check the anchor point
+        if (distSq < minDistance && distSq < radSq) {
+            selAnchorIndex = this._selectedAnchorIndex;
+            minDistance = distSq;
+            retCode = retCode | this.SEL_ANCHOR;
+        }
+    }
+    //now check if the click location is close to any anchor position
+    if (selAnchorIndex===-1) {
+        for (var i = 0; i < numAnchors; i++) {
+            var distSq = this._Anchors[i].getDistanceSq(pickX, pickY, pickZ);
+            //check the anchor point
+            if (distSq < minDistance && distSq < radSq) {
+                selAnchorIndex = i;
+                minDistance = distSq;
+                retCode = retCode | this.SEL_ANCHOR;
+            }
+        }//for every anchor i
+    }
+
+    //check the prev and next of the selected anchor if the above did not register a hit
+    if (this._selectedAnchorIndex>=0 && selAnchorIndex === -1) {
+        var distSq = this._Anchors[this._selectedAnchorIndex].getPrevDistanceSq(pickX, pickY, pickZ);
+        if (distSq < minDistance && distSq < radSq){
+            selAnchorIndex = this._selectedAnchorIndex;
+            minDistance = distSq;
+            retCode = retCode | this.SEL_PREV;
+        } else {
+            //check the next for this anchor point
+            distSq = this._Anchors[this._selectedAnchorIndex].getNextDistanceSq(pickX, pickY, pickZ);
+            if (distSq<minDistance && distSq<radSq){
+                selAnchorIndex = this._selectedAnchorIndex;
+                minDistance = distSq;
+                retCode = retCode | this.SEL_NEXT;
+            }
+        }
+    }
+    var retParam = null;
+    if (retCode !== this.SEL_NONE) {
+        retCode = retCode | this.SEL_PATH; //ensure that path is also selected if anything else is selected
+        this._selectedAnchorIndex = selAnchorIndex;
+    } else {
+        this._selectedAnchorIndex = -1;
+        var numSegments = this._isClosed ? numAnchors : numAnchors-1;
+        for (var i = 0; i < numSegments; i++) {
+            var nextIndex = (i+1)%numAnchors;
+            //check if the point is close to the bezier segment between anchor i and anchor nextIndex
+            var controlPoints = Vector.create([Vector.create([this._Anchors[i].getPosX(),this._Anchors[i].getPosY(),this._Anchors[i].getPosZ()]),
+                Vector.create([this._Anchors[i].getNextX(),this._Anchors[i].getNextY(),this._Anchors[i].getNextZ()]),
+                Vector.create([this._Anchors[nextIndex].getPrevX(),this._Anchors[nextIndex].getPrevY(),this._Anchors[nextIndex].getPrevZ()]),
+                Vector.create([this._Anchors[nextIndex].getPosX(),this._Anchors[nextIndex].getPosY(),this._Anchors[nextIndex].getPosZ()])]);
+            var point = Vector.create([pickX, pickY, pickZ]);
+            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
+                    this._selectedAnchorIndex = i;
+                    break;
+                }
+            }
+        }//for every anchor i
+    }
+    this._selectMode = retCode;
+    return retParam;
+}     //GLSubpath.pickPath function
+
+
 GLSubpath.prototype.getSelectedAnchorIndex = function () { return this._selectedAnchorIndex; }
 GLSubpath.prototype.getSelectedMode = function () { return this._selectMode; }
 
@@ -1019,69 +1113,3 @@ GLSubpath.prototype.collidesWithPoint = function (x, y) {
     return true;
 }
 
-
-//pick the path point closest to the specified location, return null if some anchor point (or its handles) is within radius, else return the parameter distance
-GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius) {
-    var numAnchors = this._Anchors.length;
-    var selAnchorIndex = -1;
-    var retCode = this.SEL_NONE;
-    var radSq = radius * radius;
-    var minDistance = Infinity;
-    for (var i = 0; i < numAnchors; i++) {
-        var distSq = this._Anchors[i].getDistanceSq(pickX, pickY, pickZ);
-        //check the anchor point
-        if (distSq < minDistance && distSq < radSq) {
-            selAnchorIndex = i;
-            minDistance = distSq;
-            retCode = retCode | this.SEL_ANCHOR;
-        }
-    }//for every anchor i
-
-    //check the prev and next of the selected anchor if the above did not register a hit
-    if (this._selectedAnchorIndex>=0 && selAnchorIndex === -1) {
-        var distSq = this._Anchors[this._selectedAnchorIndex].getPrevDistanceSq(pickX, pickY, pickZ);
-        if (distSq < minDistance && distSq < radSq){
-            selAnchorIndex = this._selectedAnchorIndex;
-            minDistance = distSq;
-            retCode = retCode | this.SEL_PREV;
-        } else {
-            //check the next for this anchor point
-            distSq = this._Anchors[this._selectedAnchorIndex].getNextDistanceSq(pickX, pickY, pickZ);
-            if (distSq<minDistance && distSq<radSq){
-                selAnchorIndex = this._selectedAnchorIndex;
-                minDistance = distSq;
-                retCode = retCode | this.SEL_NEXT;
-            }
-        }
-    }
-    var retParam = null;
-    if (retCode !== this.SEL_NONE) {
-        retCode = retCode | this.SEL_PATH; //ensure that path is also selected if anything else is selected
-        this._selectedAnchorIndex = selAnchorIndex;
-    } else {
-        this._selectedAnchorIndex = -1;
-        var numSegments = this._isClosed ? numAnchors : numAnchors-1;
-        for (var i = 0; i < numSegments; i++) {
-            var nextIndex = (i+1)%numAnchors;
-            //check if the point is close to the bezier segment between anchor i and anchor nextIndex
-            var controlPoints = Vector.create([Vector.create([this._Anchors[i].getPosX(),this._Anchors[i].getPosY(),this._Anchors[i].getPosZ()]),
-                Vector.create([this._Anchors[i].getNextX(),this._Anchors[i].getNextY(),this._Anchors[i].getNextZ()]),
-                Vector.create([this._Anchors[nextIndex].getPrevX(),this._Anchors[nextIndex].getPrevY(),this._Anchors[nextIndex].getPrevZ()]),
-                Vector.create([this._Anchors[nextIndex].getPosX(),this._Anchors[nextIndex].getPosY(),this._Anchors[nextIndex].getPosZ()])]);
-            var point = Vector.create([pickX, pickY, pickZ]);
-            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
-                    this._selectedAnchorIndex = i;
-                    break;
-                }
-            }
-        }//for every anchor i
-    }
-    this._selectMode = retCode;
-    return retParam;
-}     //GLSubpath.pickPath function
\ No newline at end of file