From 0f46001f9a02e489e27a9a36c19e45ef388df5d5 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 30 Jul 2018 10:29:53 -0700
Subject: [PATCH] remove redundent variable

---
 .../controllerModules/nearParentGrabEntity.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
index 7d22e3b232..a0a4608fbc 100644
--- a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
@@ -12,28 +12,29 @@
    findGroupParent, Vec3, cloneEntity, entityIsCloneable, propsAreCloneDynamic, HAPTIC_PULSE_STRENGTH,
    HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE, findHandChildEntities, TEAR_AWAY_DISTANCE, MSECS_PER_SEC, TEAR_AWAY_CHECK_TIME,
    TEAR_AWAY_COUNT, distanceBetweenPointAndEntityBoundingBox, print, Uuid, highlightTargetEntity, unhighlightTargetEntity,
-   distanceBetweenEntityLocalPositionAndBoundingBox
+   distanceBetweenEntityLocalPositionAndBoundingBox, GRAB_POINT_SPHERE_OFFSET
 */
 
 Script.include("/~/system/libraries/controllerDispatcherUtils.js");
 Script.include("/~/system/libraries/cloneEntityUtils.js");
+Script.include("/~/system/libraries/controllers.js");
 
 (function() {
 
     // XXX this.ignoreIK = (grabbableData.ignoreIK !== undefined) ? grabbableData.ignoreIK : true;
     // XXX this.kinematicGrab = (grabbableData.kinematic !== undefined) ? grabbableData.kinematic : NEAR_GRABBING_KINEMATIC;
 
-    var GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE = { x: 0.01, y: -0.13, z: 0.039 };
-
-    function getGrabPointSphereOffset(handController) {
-        var offset = GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE;
+    function getGrabOffset(handController) {
+        var offset = GRAB_POINT_SPHERE_OFFSET;
         if (handController === Controller.Standard.LeftHand) {
             offset = {
-                x: -GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE.x,
-                y: GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE.y,
-                z: GRAB_POINT_SPHERE_OFFSET_IN_JOINT_SPACE.z
+                x: -GRAB_POINT_SPHERE_OFFSET.x,
+                y: GRAB_POINT_SPHERE_OFFSET.y,
+                z: GRAB_POINT_SPHERE_OFFSET.z
             };
         }
+
+        offset.y = -GRAB_POINT_SPHERE_OFFSET.y;
         return Vec3.multiply(MyAvatar.sensorToWorldScale, offset);
     }
 
@@ -189,7 +190,7 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
                 if (props.parentID === MyAvatar.SELF_ID) {
                     var tearAwayDistance = TEAR_AWAY_DISTANCE * MyAvatar.sensorToWorldScale;
                     var controllerIndex = (this.hand === LEFT_HAND ? Controller.Standard.LeftHand : Controller.Standard.RightHand);
-                    var controllerGrabOffset = getGrabPointSphereOffset(controllerIndex);
+                    var controllerGrabOffset = getGrabOffset(controllerIndex);
                     var distance = distanceBetweenEntityLocalPositionAndBoundingBox(props, controllerGrabOffset);
                     if (distance > tearAwayDistance) {
                         this.autoUnequipCounter++;