From 8c83bd29a39376eb045edf7e5244dc82bf296390 Mon Sep 17 00:00:00 2001
From: druiz17 <danteruiz11@yahoo.com>
Date: Thu, 7 Jun 2018 14:04:39 -0700
Subject: [PATCH] making requested changes

---
 interface/resources/images/button-close.png   | Bin 3451 -> 0 bytes
 .../src/scripting/HMDScriptingInterface.h     |  12 ++++++
 scripts/system/libraries/WebTablet.js         |  35 ------------------
 scripts/system/tablet-ui/tabletUI.js          |   4 ++
 4 files changed, 16 insertions(+), 35 deletions(-)
 delete mode 100644 interface/resources/images/button-close.png

diff --git a/interface/resources/images/button-close.png b/interface/resources/images/button-close.png
deleted file mode 100644
index 94513e62d8c4a5b1baaa9d243e2e6fe3bfbc6bfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3451
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

diff --git a/interface/src/scripting/HMDScriptingInterface.h b/interface/src/scripting/HMDScriptingInterface.h
index 9139e62fcd..d4dba2f0f5 100644
--- a/interface/src/scripting/HMDScriptingInterface.h
+++ b/interface/src/scripting/HMDScriptingInterface.h
@@ -56,6 +56,8 @@ class QScriptEngine;
  * @property {Uuid} tabletID - The UUID of the tablet body model overlay.
  * @property {Uuid} tabletScreenID - The UUID of the tablet's screen overlay.
  * @property {Uuid} homeButtonID - The UUID of the tablet's "home" button overlay.
+ * @property {Uuid} homeButtonHighlightMaterialID - The UUID of the material entity used to highlight tablet button
+ * @property {Uuid} homeButtonUnhighlightMaterialID - The UUID of the material entity use to unhighlight the entity
  */
 class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Dependency {
     Q_OBJECT
@@ -67,6 +69,8 @@ class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Depen
     Q_PROPERTY(QUuid tabletID READ getCurrentTabletFrameID WRITE setCurrentTabletFrameID)
     Q_PROPERTY(QUuid homeButtonID READ getCurrentHomeButtonID WRITE setCurrentHomeButtonID)
     Q_PROPERTY(QUuid tabletScreenID READ getCurrentTabletScreenID WRITE setCurrentTabletScreenID)
+    Q_PROPERTY(QUuid homeButtonHighlightMaterialID READ getCurrentHomeButtonHighlightMaterialID WRITE setCurrentHomeButtonHighlightMaterialID)
+    Q_PROPERTY(QUuid homeButtonUnhighlightMaterialID READ getCurrentHomeButtonUnhighlightMaterialID WRITE setCurrentHomeButtonUnhighlightMaterialID)
 
 public:
     
@@ -373,6 +377,12 @@ public:
     void setCurrentTabletScreenID(QUuid tabletID) { _tabletScreenID = tabletID; }
     QUuid getCurrentTabletScreenID() const { return _tabletScreenID; }
 
+    void setCurrentHomeButtonHighlightMaterialID(QUuid homeButtonHighlightMaterialID) { _homeButtonHighlightMaterialID = homeButtonHighlightMaterialID; }
+    QUuid getCurrentHomeButtonHighlightMaterialID() { return _homeButtonHighlightMaterialID; }
+
+    void setCurrentHomeButtonUnhighlightMaterialID(QUuid homeButtonUnhighlightMaterialID) { _homeButtonUnhighlightMaterialID = homeButtonUnhighlightMaterialID; }
+    QUuid getCurrentHomeButtonUnhighlightMaterialID() { return _homeButtonUnhighlightMaterialID; }
+
 private:
     bool _showTablet { false };
     bool _tabletContextualMode { false };
@@ -380,6 +390,8 @@ private:
     QUuid _tabletScreenID; // this is the overlayID which is part of (a child of) the tablet-ui.
     QUuid _homeButtonID;
     QUuid _tabletEntityID;
+    QUuid _homeButtonHighlightMaterialID;
+    QUuid _homeButtonUnhighlightMaterialID;
 
     // Get the position of the HMD
     glm::vec3 getPosition() const;
diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index da96481022..2245308134 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -176,22 +176,6 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         parentJointIndex: -1
     });
 
-    this.homeButtonMaterial = Entities.addEntity({
-        type: "Material",
-        materialURL: "materialData",
-        priority: 1,
-        materialData: JSON.stringify({
-            materials: {
-                albedoMap: HOME_BUTTON_TEXTURE
-            }
-        }),
-        userData: JSON.stringify({
-            "grabbableKey": {"grabbable": false}
-        }),
-        parentMaterialName: 4,
-        parentID: this.tabletEntityID
-    });
-
     this.homeButtonUnhighlightMaterial = Entities.addEntity({
         type: "Material",
         materialURL: "materialData",
@@ -386,7 +370,6 @@ WebTablet.prototype.destroy = function () {
     Overlays.deleteOverlay(this.webOverlayID);
     Overlays.deleteOverlay(this.tabletEntityID);
     Overlays.deleteOverlay(this.homeButtonID);
-    Entities.deleteEntity(this.homeButtonMaterial);
     Entities.deleteEntity(this.homeButtonUnhighlightMaterial);
     Entities.deleteEntity(this.homeButtonHighlightMaterial);
     HMD.displayModeChanged.disconnect(this.myOnHmdChanged);
@@ -627,20 +610,6 @@ WebTablet.prototype.scheduleMouseMoveProcessor = function() {
     }
 };
 
-WebTablet.prototype.handleHomeButtonHover = function(x, y) {
-    var pickRay = Camera.computePickRay(x, y);
-    var entityPickResults;
-    var homebuttonHovered = false;
-    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.homeButtonID], []);
-        if (overlayPickResults.intersects && overlayPickResults.overlayID === this.homeButtonID) {
-            homebuttonHovered = true;
-        }
-    }
-}
-
 WebTablet.prototype.mouseMoveEvent = function (event) {
     if (this.dragging) {
         this.currentMouse = {
@@ -648,8 +617,6 @@ WebTablet.prototype.mouseMoveEvent = function (event) {
             y: event.y
         };
         this.scheduleMouseMoveProcessor();
-    } else {
-        this.handleHomeButtonHover(event.x, event.y);
     }
 };
 
@@ -676,8 +643,6 @@ WebTablet.prototype.mouseMoveProcessor = function () {
             });
         }
         this.scheduleMouseMoveProcessor();
-    } else {
-        this.handleHomeButtonHover(this.currentMouse.x, this.currentMouse.y);
     }
 };
 
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 6526c65178..29dc457197 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -104,6 +104,8 @@
         HMD.tabletID = UIWebTablet.tabletEntityID;
         HMD.homeButtonID = UIWebTablet.homeButtonID;
         HMD.tabletScreenID = UIWebTablet.webOverlayID;
+        HMD.homeButtonHighlightMaterialID = UIWebTablet.homeButtonHighlightMaterial;
+        HMD.homeButtonUnhighlightMaterialID = UIWebTablet.homeButtonUnhighlightMaterial;
         HMD.displayModeChanged.connect(onHmdChanged);
         MyAvatar.sensorToWorldScaleChanged.connect(onSensorToWorldScaleChanged);
 
@@ -322,5 +324,7 @@
         HMD.tabletID = null;
         HMD.homeButtonID = null;
         HMD.tabletScreenID = null;
+        HMD.homeButtonHighlightMaterialID = null;
+        HMD.homeButtonUnhighlightMaterialID = null;
     });
 }()); // END LOCAL_SCOPE