From d4a4c8902ae069f97fe2f5baafe8cfa733d1929b Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Mon, 27 Nov 2017 17:46:19 -0800
Subject: [PATCH] fix reticle depth at different scales and x button click on
 mouse press

---
 .../src/display-plugins/CompositorHelper.cpp  |  6 ++--
 scripts/system/libraries/WebTablet.js         | 34 ++++++-------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
index 7b639e8308..f3f81c0b2e 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
@@ -437,9 +437,11 @@ glm::mat4 CompositorHelper::getReticleTransform(const glm::mat4& eyePose, const
         } else {
             d = glm::normalize(overlaySurfacePoint);
         }
-        reticlePosition = headPosition + (d * getReticleDepth());
+        // Our sensor to world matrix always has uniform scale
+        float sensorSpaceReticleDepth = getReticleDepth() / extractScale(_sensorToWorldMatrix).x;
+        reticlePosition = headPosition + (d * sensorSpaceReticleDepth);
         quat reticleOrientation = cancelOutRoll(glm::quat_cast(_currentDisplayPlugin->getHeadPose()));
-        vec3 reticleScale = vec3(Cursor::Manager::instance().getScale() * reticleSize * getReticleDepth());
+        vec3 reticleScale = vec3(Cursor::Manager::instance().getScale() * reticleSize * sensorSpaceReticleDepth);
         return glm::inverse(eyePose) * createMatFromScaleQuatAndPos(reticleScale, reticleOrientation, reticlePosition);
     } else {
         static const float CURSOR_PIXEL_SIZE = 32.0f;
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 01fdfb1845..4217ec503e 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -514,31 +514,17 @@ WebTablet.prototype.getPosition = function () {
 };
 
 WebTablet.prototype.mousePressEvent = function (event) {
-    var pickRay = Camera.computePickRay(event.x, event.y);
-    var entityPickResults;
-    entityPickResults = Overlays.findRayIntersection(pickRay, true, [this.tabletEntityID]);
-    if (entityPickResults.intersects && (entityPickResults.entityID === this.tabletEntityID ||
-                                         entityPickResults.overlayID === this.tabletEntityID)) {
-        var overlayPickResults = Overlays.findRayIntersection(pickRay, true, [this.webOverlayID, this.homeButtonID], []);
-        if (overlayPickResults.intersects && overlayPickResults.overlayID === this.homeButtonID) {
-            var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-            var onHomeScreen = tablet.onHomeScreen();
-            var isMessageOpen = tablet.isMessageDialogOpen();
-            if (onHomeScreen) {
-                if (isMessageOpen === false) {
-                    HMD.closeTablet();
-                }
-            } else {
-                if (isMessageOpen === false) {
-                    tablet.gotoHomeScreen();
-                    this.setHomeButtonTexture();
-                }
+    if (!HMD.active) {
+        var pickRay = Camera.computePickRay(event.x, event.y);
+        var tabletBackPickResults = Overlays.findRayIntersection(pickRay, true, [this.tabletEntityID]);
+        if (tabletBackPickResults.intersects) {
+            var overlayPickResults = Overlays.findRayIntersection(pickRay, true, [this.webOverlayID, this.homeButtonID]);
+            if (!overlayPickResults.intersects) {
+                this.dragging = true;
+                var invCameraXform = new Xform(Camera.orientation, Camera.position).inv();
+                this.initialLocalIntersectionPoint = invCameraXform.xformPoint(tabletBackPickResults.intersection);
+                this.initialLocalPosition = Overlays.getProperty(this.tabletEntityID, "localPosition");
             }
-        } else if (!HMD.active && (!overlayPickResults.intersects || overlayPickResults.overlayID !== this.webOverlayID)) {
-            this.dragging = true;
-            var invCameraXform = new Xform(Camera.orientation, Camera.position).inv();
-            this.initialLocalIntersectionPoint = invCameraXform.xformPoint(entityPickResults.intersection);
-            this.initialLocalPosition = Overlays.getProperty(this.tabletEntityID, "localPosition");
         }
     }
 };