From 9b33e6757f6d33a2057d4b0bfc88a1406bf97599 Mon Sep 17 00:00:00 2001
From: David Back <davidback@highfidelity.io>
Date: Fri, 15 Jun 2018 14:29:47 -0700
Subject: [PATCH] prevent edit press events when pointing at desktop window or
 tablet

---
 .../controllerModules/inEditMode.js           | 34 +++++++++++++++++++
 .../system/libraries/entitySelectionTool.js   | 24 ++++++++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/scripts/system/controllers/controllerModules/inEditMode.js b/scripts/system/controllers/controllerModules/inEditMode.js
index 5d90898b82..d0c2f94f85 100644
--- a/scripts/system/controllers/controllerModules/inEditMode.js
+++ b/scripts/system/controllers/controllerModules/inEditMode.js
@@ -18,10 +18,16 @@ Script.include("/~/system/libraries/controllers.js");
 Script.include("/~/system/libraries/utils.js");
 
 (function () {
+	var MARGIN = 25;
+	
     function InEditMode(hand) {
         this.hand = hand;
         this.triggerClicked = false;
         this.selectedTarget = null;
+		this.reticleMinX = MARGIN;
+        this.reticleMaxX;
+        this.reticleMinY = MARGIN;
+        this.reticleMaxY;
 
         this.parameters = makeDispatcherModuleParameters(
             160,
@@ -47,6 +53,16 @@ Script.include("/~/system/libraries/utils.js");
             return (HMD.tabletScreenID && objectID === HMD.tabletScreenID)
                 || (HMD.homeButtonID && objectID === HMD.homeButtonID);
         };
+		
+        this.calculateNewReticlePosition = function(intersection) {
+            var dims = Controller.getViewportDimensions();
+            this.reticleMaxX = dims.x - MARGIN;
+            this.reticleMaxY = dims.y - MARGIN;
+            var point2d = HMD.overlayFromWorldPoint(intersection);
+            point2d.x = Math.max(this.reticleMinX, Math.min(point2d.x, this.reticleMaxX));
+            point2d.y = Math.max(this.reticleMinY, Math.min(point2d.y, this.reticleMaxY));
+            return point2d;
+        };
 
         this.sendPickData = function(controllerData) {
             if (controllerData.triggerClicks[this.hand]) {
@@ -72,7 +88,24 @@ Script.include("/~/system/libraries/utils.js");
 
                 this.triggerClicked = true;
             }
+			
+			this.sendPointingAtData(controllerData);
         };
+		
+		this.sendPointingAtData = function(controllerData) {
+			var rayPick = controllerData.rayPicks[this.hand];
+			var hudRayPick = controllerData.hudRayPicks[this.hand];
+			var point2d = this.calculateNewReticlePosition(hudRayPick.intersection);
+			var desktopWindow = Window.isPointOnDesktopWindow(point2d);
+			var tablet = this.pointingAtTablet(rayPick.objectID);
+			var rightHand = this.hand === RIGHT_HAND;
+			Messages.sendLocalMessage("entityToolUpdates", JSON.stringify({
+				method: "pointingAt",
+				desktopWindow: desktopWindow,
+				tablet: tablet,
+				rightHand: rightHand
+            }));
+		};
 
         this.exitModule = function() {
             return makeRunningValues(false, [], []);
@@ -104,6 +137,7 @@ Script.include("/~/system/libraries/utils.js");
             if (overlayLaser) {
                 var overlayLaserReady = overlayLaser.isReady(controllerData);
                 var target = controllerData.rayPicks[this.hand].objectID;
+				this.sendPointingAtData(controllerData);
                 if (overlayLaserReady.active && this.pointingAtTablet(target)) {
                     return this.exitModule();
                 }
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 3f9c331b47..35ea579824 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -58,6 +58,14 @@ SelectionManager = (function() {
             that.setSelections([messageParsed.entityID]);
         } else if (messageParsed.method === "clearSelection") {
             that.clearSelections();
+        } else if (messageParsed.method === "pointingAt") {
+			if (messageParsed.rightHand) {
+				that.pointingAtDesktopWindowRight = messageParsed.desktopWindow;
+				that.pointingAtTabletRight = messageParsed.tablet;
+			} else {
+				that.pointingAtDesktopWindowLeft = messageParsed.desktopWindow;
+				that.pointingAtTabletLeft = messageParsed.tablet;
+			}
         }
     }
 
@@ -93,6 +101,11 @@ SelectionManager = (function() {
     that.worldDimensions = Vec3.ZERO;
     that.worldRegistrationPoint = Vec3.HALF;
     that.centerPosition = Vec3.ZERO;
+	
+	that.pointingAtDesktopWindowLeft = false;
+	that.pointingAtDesktopWindowRight = false;
+	that.pointingAtTabletLeft = false;
+	that.pointingAtTabletRight = false;
 
     that.saveProperties = function() {
         that.savedProperties = {};
@@ -667,7 +680,16 @@ SelectionDisplay = (function() {
                     activeHand = (activeHand === Controller.Standard.RightHand) ?
                         Controller.Standard.LeftHand : Controller.Standard.RightHand;
                 }
-                that.mousePressEvent({});
+				var pointingAtDesktopWindow = (hand === Controller.Standard.RightHand && 
+											   SelectionManager.pointingAtDesktopWindowRight) ||
+											  (hand === Controller.Standard.LeftHand && 
+											   SelectionManager.pointingAtDesktopWindowLeft);
+				var pointingAtTablet = (hand === Controller.Standard.RightHand && SelectionManager.pointingAtTabletRight) ||
+									   (hand === Controller.Standard.LeftHand && SelectionManager.pointingAtTabletLeft);
+                if (pointingAtDesktopWindow || pointingAtTablet) {
+					return;
+                }
+				that.mousePressEvent({});
             } else if (that.triggered && (value < that.TRIGGER_OFF_VALUE)) {
                 that.triggered = false;
                 that.mouseReleaseEvent({});