From 29c268df5ae0e4c9bf03543d9b96047da74f8490 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Sat, 24 Nov 2018 11:38:54 +1300
Subject: [PATCH] Remove extraneous grab entity haptic pulses

---
 .../controllers/controllerModules/farParentGrabEntity.js | 6 ------
 .../controllerModules/nearActionGrabEntity.js            | 7 -------
 .../controllerModules/nearParentGrabEntity.js            | 9 ---------
 3 files changed, 22 deletions(-)

diff --git a/scripts/system/controllers/controllerModules/farParentGrabEntity.js b/scripts/system/controllers/controllerModules/farParentGrabEntity.js
index f85869aa7f..4b85c6d046 100644
--- a/scripts/system/controllers/controllerModules/farParentGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farParentGrabEntity.js
@@ -256,7 +256,6 @@ Script.include("/~/system/libraries/controllers.js");
         };
 
         this.endFarParentGrab = function (controllerData) {
-            this.hapticTargetID = null;
             // var endProps = controllerData.nearbyEntityPropertiesByID[this.targetEntityID];
             var endProps = Entities.getEntityProperties(this.targetEntityID, DISPATCHER_PROPERTIES);
             if (this.thisFarGrabJointIsParent(endProps)) {
@@ -410,11 +409,6 @@ Script.include("/~/system/libraries/controllers.js");
             if (targetEntity) {
                 var gtProps = Entities.getEntityProperties(targetEntity, DISPATCHER_PROPERTIES);
                 if (entityIsGrabbable(gtProps)) {
-                    // give haptic feedback
-                    if (gtProps.id !== this.hapticTargetID) {
-                        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-                        this.hapticTargetID = gtProps.id;
-                    }
                     // if we've attempted to grab a child, roll up to the root of the tree
                     var groupRootProps = findGroupParent(controllerData, gtProps);
                     if (entityIsGrabbable(groupRootProps)) {
diff --git a/scripts/system/controllers/controllerModules/nearActionGrabEntity.js b/scripts/system/controllers/controllerModules/nearActionGrabEntity.js
index 5ced6080a2..1d1f89e2c7 100644
--- a/scripts/system/controllers/controllerModules/nearActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/nearActionGrabEntity.js
@@ -24,7 +24,6 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
         this.hand = hand;
         this.targetEntityID = null;
         this.actionID = null; // action this script created...
-        this.hapticTargetID = null;
 
         this.parameters = makeDispatcherModuleParameters(
             500,
@@ -171,10 +170,6 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
                     break;
                 }
                 if (entityIsGrabbable(props) || entityIsCloneable(props)) {
-                    if (props.id !== this.hapticTargetID) {
-                        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-                        this.hapticTargetID = props.id;
-                    }
                     if (!entityIsCloneable(props)) {
                         // if we've attempted to grab a non-cloneable child, roll up to the root of the tree
                         var groupRootProps = findGroupParent(controllerData, props);
@@ -206,7 +201,6 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
                     return makeRunningValues(true, [this.targetEntityID], []);
                 }
             } else {
-                this.hapticTargetID = null;
                 return makeRunningValues(false, [], []);
             }
         };
@@ -216,7 +210,6 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
                 if (controllerData.triggerClicks[this.hand] < TRIGGER_OFF_VALUE &&
                     controllerData.secondaryValues[this.hand] < TRIGGER_OFF_VALUE) {
                     this.endNearGrabAction();
-                    this.hapticTargetID = null;
                     return makeRunningValues(false, [], []);
                 }
 
diff --git a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
index db10fff69a..3be6f602c2 100644
--- a/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
@@ -32,7 +32,6 @@ Script.include("/~/system/libraries/controllers.js");
         this.previousParentID = {};
         this.previousParentJointIndex = {};
         this.previouslyUnhooked = {};
-        this.hapticTargetID = null;
         this.lastUnequipCheckTime = 0;
         this.autoUnequipCounter = 0;
         this.lastUnexpectedChildrenCheckTime = 0;
@@ -138,7 +137,6 @@ Script.include("/~/system/libraries/controllers.js");
         };
 
         this.endNearParentingGrabEntity = function (controllerData) {
-            this.hapticTargetID = null;
             var props = controllerData.nearbyEntityPropertiesByID[this.targetEntityID];
             if (this.thisHandIsParent(props) && !this.robbed) {
                 Entities.editEntity(this.targetEntityID, {
@@ -248,11 +246,6 @@ Script.include("/~/system/libraries/controllers.js");
                     continue;
                 }
                 if (entityIsGrabbable(props) || entityIsCloneable(props)) {
-                    // give haptic feedback
-                    if (props.id !== this.hapticTargetID) {
-                        Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand);
-                        this.hapticTargetID = props.id;
-                    }
                     if (!entityIsCloneable(props)) {
                         // if we've attempted to grab a non-cloneable child, roll up to the root of the tree
                         var groupRootProps = findGroupParent(controllerData, props);
@@ -295,7 +288,6 @@ Script.include("/~/system/libraries/controllers.js");
                     unhighlightTargetEntity(this.highlightedEntity);
                     this.highlightedEntity = null;
                 }
-                this.hapticTargetID = null;
                 this.robbed = false;
                 return makeRunningValues(false, [], []);
             }
@@ -316,7 +308,6 @@ Script.include("/~/system/libraries/controllers.js");
                     this.highlightedEntity = null;
                     this.grabbing = false;
                     this.targetEntityID = null;
-                    this.hapticTargetID = null;
                     this.robbed = false;
                     return makeRunningValues(false, [], []);
                 }