From 9ca38054999b581323d0c7da416e5d0a9d72007e Mon Sep 17 00:00:00 2001 From: danteruiz Date: Thu, 7 Mar 2019 10:27:16 -0800 Subject: [PATCH] making requested changes --- interface/src/raypick/StylusPick.cpp | 2 +- scripts/system/libraries/WebTablet.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/raypick/StylusPick.cpp b/interface/src/raypick/StylusPick.cpp index 2bd371c506..9139a16c6d 100644 --- a/interface/src/raypick/StylusPick.cpp +++ b/interface/src/raypick/StylusPick.cpp @@ -160,7 +160,7 @@ PickResultPointer StylusPick::getEntityIntersection(const StylusTip& pick) { // TODO: Use the xz projection method for Sphere and Quad. if (entityType == EntityTypes::Gizmo) { - normal = entityRotation * Vectors::UNIT_NEG_Y; + normal = entityRotation * Vectors::UNIT_Y; } else { normal = entityRotation * Vectors::UNIT_Z; } diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index c5ae9730f2..ceb7d8e77e 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -176,10 +176,10 @@ WebTablet = function (url, width, dpi, hand, location, visible) { this.homeButtonID = Overlays.addOverlay("circle3d", { name: "homeButton", localPosition: { x: HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET }, - localRotation: { x: 0, y: 1, z: 0, w: 0}, + localRotation: Quat.fromVec3Degrees({ x: 180, y: 180, z: 0}), dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim }, solid: true, - alpha: 0.0, + alpha: 1.0, visible: visible, drawInFront: false, parentID: this.tabletEntityID, @@ -189,7 +189,7 @@ WebTablet = function (url, width, dpi, hand, location, visible) { this.homeButtonHighlightID = Overlays.addOverlay("circle3d", { name: "homeButtonHighlight", localPosition: { x: -HOME_BUTTON_X_OFFSET, y: HOME_BUTTON_Y_OFFSET, z: -HOME_BUTTON_Z_OFFSET }, - localRotation: { x: 0, y: 1, z: 0, w: 0}, + localRotation: { x: 0, y: -1, z: 0, w: 0}, dimensions: { x: homeButtonDim, y: homeButtonDim, z: homeButtonDim }, color: {red: 255, green: 255, blue: 255}, solid: true,