From 58e04f8e35f80f0126dfe4e2f37de9b382de5b24 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 20 Jan 2017 19:43:13 +0000 Subject: [PATCH] home button works in desktop mode --- scripts/system/libraries/WebTablet.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index 7b321b0dd9..5f0671f389 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -190,7 +190,7 @@ WebTablet.prototype.getOverlayObject = function () { WebTablet.prototype.destroy = function () { Overlays.deleteOverlay(this.webOverlayID); Entities.deleteEntity(this.tabletEntityID); - Overlays.deleteEntity(this.homeButtonEntity); + Overlays.deleteOverlay(this.homeButtonEntity); HMD.displayModeChanged.disconnect(this.myOnHmdChanged); if (HMD.active) { @@ -305,7 +305,10 @@ WebTablet.prototype.mousePressEvent = function (event) { var entityPickResults = Entities.findRayIntersection(pickRay, true); // non-accurate picking if (entityPickResults.intersects && entityPickResults.entityID === this.tabletEntityID) { var overlayPickResults = Overlays.findRayIntersection(pickRay); - if (!overlayPickResults.intersects || !overlayPickResults.overlayID === this.webOverlayID) { + if (overlayPickResults.intersects && overlayPickResults.overlayID === HMD.homeButtonID) { + var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); + tablet.gotoHomeScreen(); + } else if (!overlayPickResults.intersects || !overlayPickResults.overlayID === this.webOverlayID) { this.dragging = true; var invCameraXform = new Xform(Camera.orientation, Camera.position).inv(); this.initialLocalIntersectionPoint = invCameraXform.xformPoint(entityPickResults.intersection);