From b252c81d8484127119b682c6fe9102e2598c15f5 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 16 Nov 2017 15:34:42 -0800 Subject: [PATCH] fix home button hover overlay dimensions --- scripts/system/libraries/WebTablet.js | 3 +-- scripts/system/libraries/utils.js | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index c46cfaa073..57b17f3d72 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -155,8 +155,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) { localRotation: { x: 0, y: 1, z: 0, w: 0 }, dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor }, solid: true, - outerRadius: 25 * tabletScaleFactor, - innerRadius: 20 * tabletScaleFactor, + innerRadius: 0.9, ignoreIntersection: true, alpha: 1.0, color: { red: 255, green: 255, blue: 255 }, diff --git a/scripts/system/libraries/utils.js b/scripts/system/libraries/utils.js index 76c248d880..9706073081 100644 --- a/scripts/system/libraries/utils.js +++ b/scripts/system/libraries/utils.js @@ -409,15 +409,16 @@ resizeTablet = function (width, newParentJointIndex, sensorToWorldScaleOverride) // update homeButton var HOME_BUTTON_Y_OFFSET = ((tabletHeight / 2) - (tabletHeight / 20)) * sensorScaleOffsetOverride; + var homeButtonDim = 4 * tabletScaleFactor; Overlays.editOverlay(HMD.homeButtonID, { localPosition: {x: -0.001, y: -HOME_BUTTON_Y_OFFSET, z: 0.0}, - dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor} + dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim} }); + // Circle3D overlays render at 1.5x their proper dimensions + var highlightDim = homeButtonDim / 3.0; Overlays.editOverlay(HMD.homeButtonHighlightID, { localPosition: { x: 0, y: -HOME_BUTTON_Y_OFFSET + 0.003, z: -0.0158 }, - dimensions: { x: 4 * tabletScaleFactor, y: 4 * tabletScaleFactor, z: 4 * tabletScaleFactor }, - outerRadius: 25 * tabletScaleFactor, - innerRadius: 20 * tabletScaleFactor + dimensions: { x: highlightDim, y: highlightDim, z: highlightDim } }); };