From 55a4c55f781f08f9246ec8d8e91bec48b46fd270 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 12 Sep 2018 14:48:27 -0700 Subject: [PATCH] remove unused and rename var --- scripts/system/libraries/entitySelectionTool.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js index 72e0dd3144..8830c60fc5 100644 --- a/scripts/system/libraries/entitySelectionTool.js +++ b/scripts/system/libraries/entitySelectionTool.js @@ -987,15 +987,7 @@ SelectionDisplay = (function() { that.updateHighlight = function(event) { // if no tool is active, then just look for handles to highlight... - var pickRay = generalComputePickRay(event.x, event.y); - - var interactiveOverlays = getMainTabletIDs(); - for (var key in handleTools) { - if (handleTools.hasOwnProperty(key)) { - interactiveOverlays.push(key); - } - } - + var pickRay = generalComputePickRay(event.x, event.y); var result = Overlays.findRayIntersection(pickRay); var pickedColor; var highlightNeeded = false; @@ -2338,9 +2330,10 @@ SelectionDisplay = (function() { if (controllerTrigger) { var controllerPosition = that.triggeredHand === Controller.Standard.LeftHand ? MyAvatar.getLeftHandPosition() : MyAvatar.getRightHandPosition(); - var vecPickDifference = Vec3.subtract(controllerPosition, beginControllerPosition); - var pickDifference = vecPickDifference.x + vecPickDifference.y + vecPickDifference.z; - dimensionChange = pickDifference * dimensionsMultiple; + var vecControllerDifference = Vec3.subtract(controllerPosition, beginControllerPosition); + var controllerDifference = vecControllerDifference.x + vecControllerDifference.y + + vecControllerDifference.z; + dimensionChange = controllerDifference * dimensionsMultiple; } else { var mouseXDifference = (event.x - beginMouseEvent.x) / viewportDimensions.x; var mouseYDifference = (beginMouseEvent.y - event.y) / viewportDimensions.y;