From 5f79500e4d0b8485fe6f6e73c62adfa45452ba4d Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 21 Feb 2016 09:37:43 -0800
Subject: [PATCH] fix grab-script touch

---
 examples/controllers/handControllerGrab.js | 49 ++++++++++------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/examples/controllers/handControllerGrab.js b/examples/controllers/handControllerGrab.js
index e53e2ad59c..ffca3117c1 100644
--- a/examples/controllers/handControllerGrab.js
+++ b/examples/controllers/handControllerGrab.js
@@ -1587,48 +1587,43 @@ function MyController(hand) {
         }
 
         ids.forEach(function(id) {
-
             var props = Entities.getEntityProperties(id, ["boundingBox", "name"]);
             if (props.name === 'pointer') {
                 return;
-            } else {
-                var entityMinPoint = props.boundingBox.brn;
-                var entityMaxPoint = props.boundingBox.tfl;
-                var leftIsTouching = pointInExtents(leftHandPosition, entityMinPoint, entityMaxPoint);
-                var rightIsTouching = pointInExtents(rightHandPosition, entityMinPoint, entityMaxPoint);
-
-                if ((leftIsTouching || rightIsTouching) && _this.allTouchedIDs[id] === undefined) {
-                    // we haven't been touched before, but either right or left is touching us now
-                    _this.allTouchedIDs[id] = true;
-                    _this.startTouch(id);
-                } else if ((leftIsTouching || rightIsTouching) && _this.allTouchedIDs[id]) {
-                    // we have been touched before and are still being touched
-                    // continue touch
-                    _this.continueTouch(id);
-                } else if (_this.allTouchedIDs[id]) {
-                    delete _this.allTouchedIDs[id];
-                    _this.stopTouch(id);
-
-                } else {
-                    //we are in another state
-                    return;
-                }
             }
+            var entityMinPoint = props.boundingBox.brn;
+            var entityMaxPoint = props.boundingBox.tfl;
+            var leftIsTouching = pointInExtents(leftHandPosition, entityMinPoint, entityMaxPoint);
+            var rightIsTouching = pointInExtents(rightHandPosition, entityMinPoint, entityMaxPoint);
 
+            if ((leftIsTouching || rightIsTouching) && _this.allTouchedIDs[id] === undefined) {
+                // we haven't been touched before, but either right or left is touching us now
+                _this.allTouchedIDs[id] = true;
+                _this.startTouch(id);
+            } else if ((leftIsTouching || rightIsTouching) && _this.allTouchedIDs[id]) {
+                // we have been touched before and are still being touched
+                // continue touch
+                _this.continueTouch(id);
+            } else if (_this.allTouchedIDs[id]) {
+                delete _this.allTouchedIDs[id];
+                _this.stopTouch(id);
+            }
         });
-
     };
 
     this.startTouch = function(entityID) {
-        this.callEntityMethodOnGrabbed("startTouch");
+        var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+        Entities.callEntityMethod(entityID, "startTouch", args);
     };
 
     this.continueTouch = function(entityID) {
-        this.callEntityMethodOnGrabbed("continueTouch");
+        var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+        Entities.callEntityMethod(entityID, "continueTouch", args);
     };
 
     this.stopTouch = function(entityID) {
-        this.callEntityMethodOnGrabbed("stopTouch");
+        var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+        Entities.callEntityMethod(entityID, "stopTouch", args);
     };
 
     this.release = function() {