From 7a7b9730eeef1d1fff51e5a47f51f687d24f8f6c Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Mon, 9 Jul 2018 15:36:22 -0700
Subject: [PATCH] only clamp handles in hmd outside bounding box

---
 scripts/system/libraries/entitySelectionTool.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 4ff139ee75..c9a15875f1 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1186,10 +1186,17 @@ SelectionDisplay = (function() {
             var localRotationZ = Quat.fromPitchYawRollDegrees(rotationDegrees, 0, 0);
             var rotationZ = Quat.multiply(rotation, localRotationZ);
             worldRotationZ = rotationZ;
+            
+            var selectionBoxGeometry = {
+                position: position,
+                rotation: rotation,
+                dimensions: dimensions
+            };
+            var isCameraInsideBox = isPointInsideBox(Camera.position, selectionBoxGeometry);
 
-            // in HMD we clamp the overlays to the bounding box for now so lasers can hit them
+            // in HMD if outside the bounding box clamp the overlays to the bounding box for now so lasers can hit them
             var maxHandleDimension = 0;
-            if (HMD.active) {
+            if (HMD.active && !isCameraInsideBox) {
                 maxHandleDimension = Math.max(dimensions.x, dimensions.y, dimensions.z);
             }
 
@@ -1438,12 +1445,6 @@ SelectionDisplay = (function() {
             var inModeRotate = isActiveTool(handleRotatePitchRing) || 
                                isActiveTool(handleRotateYawRing) || 
                                isActiveTool(handleRotateRollRing);
-            var selectionBoxGeometry = {
-                position: position,
-                rotation: rotation,
-                dimensions: dimensions
-            };
-            var isCameraInsideBox = isPointInsideBox(Camera.position, selectionBoxGeometry);
             selectionBoxGeometry.visible = !inModeRotate && !isCameraInsideBox;
             Overlays.editOverlay(selectionBox, selectionBoxGeometry);