From 0783629cde165d0731bb72fdb5c03ca73c91f292 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Thu, 25 Aug 2016 13:31:07 -0700
Subject: [PATCH] grab-point sphere is a child of controller joint, so it
 doesn't jitter

---
 .../system/controllers/handControllerGrab.js   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index eb1d5002bb..347e45f879 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -25,8 +25,8 @@ var WANT_DEBUG = false;
 var WANT_DEBUG_STATE = false;
 var WANT_DEBUG_SEARCH_NAME = null;
 
-var FORCE_IGNORE_IK = false;
-var SHOW_GRAB_POINT_SPHERE = false;
+var FORCE_IGNORE_IK = true;
+var SHOW_GRAB_POINT_SPHERE = true;
 
 //
 // these tune time-averaging and "on" value for analog trigger
@@ -833,12 +833,8 @@ function MyController(hand) {
         if (!SHOW_GRAB_POINT_SPHERE) {
             return;
         }
-        var controllerLocation = this.getControllerLocation();
-        if (this.grabPointSphere) {
-            Overlays.editOverlay(this.grabPointSphere, {
-                position: controllerLocation.position
-            });
-        } else {
+        if (!this.grabPointSphere) {
+            var controllerLocation = this.getControllerLocation();
             this.grabPointSphere = Overlays.addOverlay("sphere", {
                 position: controllerLocation.position,
                 rotation: { x: 0, y: 0, z: 0, w: 1 },
@@ -848,7 +844,11 @@ function MyController(hand) {
                 solid: true,
                 visible: true,
                 ignoreRayIntersection: true,
-                drawInFront: false
+                drawInFront: false,
+                parentID: MyAvatar.sessionUUID,
+                parentJointIndex: MyAvatar.getJointIndex(this.hand === RIGHT_HAND ?
+                                                         "Controller.Standard.RightHand" :
+                                                         "Controller.Standard.LeftHand")
             });
         }
     };