From 995cfeb3c5d04cb1c76a208be52d2aa33a79bb0f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 6 Jun 2018 10:42:12 -0700
Subject: [PATCH] cleaning code

---
 interface/resources/images/button-close.png | Bin 0 -> 3397 bytes
 interface/resources/images/buttonBezel.png  | Bin 1529 -> 1530 bytes
 scripts/system/libraries/WebTablet.js       |  22 +++++++++++++++++---
 scripts/system/libraries/utils.js           |   1 -
 scripts/system/tablet-ui/tabletUI.js        |   2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 interface/resources/images/button-close.png

diff --git a/interface/resources/images/button-close.png b/interface/resources/images/button-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..e15e6c0f966e1cd1b954c0059e945f7b068ad412
GIT binary patch
literal 3397
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

literal 0
HcmV?d00001

diff --git a/interface/resources/images/buttonBezel.png b/interface/resources/images/buttonBezel.png
index a85b236555ae456432ad236f2676965f6a8ddb7a..fe55855462bbd395ee3cc24095ea772c087dee13 100644
GIT binary patch
literal 1530
zcmeAS@N?(olHy`uVBq!ia0y~yU}6Aa4iHr><-C@GfkCpwHKHUqKdq!Zu_%?nF(p4K
zRlzeiF+DXXH8G{K@MNkD0|V<EPZ!6Kid%24ZWLr-U|}%4a_-;bTaMb24`-jB$I0+d
zlaqmmfq|Lf00V;o16j<0)owtU<0;q9LqX7iL!A7Ohea5SCetJewI3ia*&x|UX$o>+
zq9_4Vo(3q%KHzX5Gv;90U^Mv-L5dA>nB?d|bu^`EfC9fm9716nlB|74BqJNcwX-Z5
V--?n-85kHCJYD@<);T3K0RZp1r`iAj

literal 1529
zcmeAS@N?(olHy`uVBq!ia0y~yU}6Aa4iHr><-C@GfkCpwHKHUqKdq!Zu_%?nF(p4K
zRlzeiF+DXXH8G{K@MNkD0|V=9PZ!6Kid%248Zt64a2z%`uz&8)!_4}fEp~5JSP$4M
zGd3_XBrq^YFfgz&ki#TL50X_BYG+`h$nlhGZ(t-p=peyBcF4m+k-Uh5Yok!R1f_9E
zVG?Ly^cdhYKuPw2gg%97fI{sFh_pbaNkcpdQC<v?o&?Ob4=^Y_XOn+k%CVn;fq}u(
L)z4*}Q$iB}V;ZHZ

diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index 50802357d3..d92d3f3674 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -34,11 +34,12 @@ var DELAY_FOR_30HZ = 33; // milliseconds
 // will need to be recaclulated if dimensions of fbx model change.
 var TABLET_NATURAL_DIMENSIONS = {x: 32.083, y: 48.553, z: 2.269};
 
-var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-close.png";
+var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "images/button-close.png";
 // var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-close.png";
 // var TABLET_MODEL_PATH = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-with-home-button.fbx";
 var LOCAL_BEZEL_HIGHLIGHT = Script.resourcesPath() + "images/buttonBezel_highlight.png";
 var LOCAL_NORMAL_BEZEL = Script.resourcesPath() + "images/buttonBezel.png";
+
 var LOCAL_TABLET_MODEL_PATH = Script.resourcesPath() + "meshes/tablet-with-home-button-small-bezel.fbx";
 var SUBMESH = 0;
 
@@ -161,7 +162,6 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
     var homeButtonDim = 4.0 * tabletScaleFactor / 3.0;
     var HOME_BUTTON_X_OFFSET = 0.00079 * sensorScaleFactor;
     var HOME_BUTTON_Y_OFFSET = -1 * ((tabletHeight / 2) - (4.0 * tabletScaleFactor / 2));
-    var HOME_BUTTON_Z_OFFSET = -WEB_ENTITY_Z_OFFSET + 0.00284;
     this.homeButtonID = Overlays.addOverlay("circle3d", {
         name: "homeButton",
         localPosition: { x: HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -WEB_ENTITY_Z_OFFSET },
@@ -175,6 +175,19 @@ 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
+            }
+        }),
+        parentMaterialName: 5,
+        parentID: this.tabletEntityID
+    });
+
     this.homeButtonUnhighlightMaterial = Entities.addEntity({
         type: "Material",
         materialURL: "materialData",
@@ -197,7 +210,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         visible: false,
         materialData: JSON.stringify({
             materials: {
-                albedo: LOCAL_BEZEL_HIGHLIGHT
+                albedoMap: LOCAL_BEZEL_HIGHLIGHT
             }
 
         }),
@@ -358,6 +371,9 @@ 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);
 
     Controller.mousePressEvent.disconnect(this.myMousePressEvent);
diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js
index bc062e0dce..e6db5139aa 100644
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@@ -417,7 +417,6 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride)
     var homeButtonDim = 4.0 * tabletScaleFactor / 3.0;
     var HOME_BUTTON_X_OFFSET = 0.00079 * sensorScaleOffsetOverride * sensorScaleFactor;
     var HOME_BUTTON_Y_OFFSET = -1 * ((tabletHeight / 2) - (4.0 * tabletScaleFactor / 2)) * sensorScaleOffsetOverride;
-    var HOME_BUTTON_Z_OFFSET = (-WEB_ENTITY_Z_OFFSET + 0.00284 * sensorScaleOffsetOverride);
     Overlays.editOverlay(HMD.homeButtonID, {
         localPosition: { x: HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -WEB_ENTITY_Z_OFFSET },
         localRotation: { x: 0, y: 1, z: 0, w: 0 },
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 4ed2f30437..6526c65178 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -24,7 +24,7 @@
     var validCheckTime = Date.now();
     var debugTablet = false;
     var tabletScalePercentage = 70.0;
-    UIWebTablet = null;
+    var UIWebTablet = null;
     var MSECS_PER_SEC = 1000.0;
     var MUTE_MICROPHONE_MENU_ITEM = "Mute Microphone";
     var gTablet = null;