From ed4279783d9035f83b460a641977e10924915418 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Mon, 24 Oct 2016 20:38:49 -0700 Subject: [PATCH] CR feedback --- .../src/display-plugins/CompositorHelper.h | 2 ++ .../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 10 +++++----- scripts/system/controllers/handControllerPointer.js | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.h b/libraries/display-plugins/src/display-plugins/CompositorHelper.h index b0b96d86be..5be2d68cf9 100644 --- a/libraries/display-plugins/src/display-plugins/CompositorHelper.h +++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.h @@ -111,6 +111,8 @@ public: void setDisplayPlugin(const DisplayPluginPointer& displayPlugin) { _currentDisplayPlugin = displayPlugin; } void setFrameInfo(uint32_t frame, const glm::mat4& camera) { _currentCamera = camera; } + float getHmdUiRadius() const { return _hmdUIRadius; } + signals: void allowMouseCaptureChanged(); void alphaChanged(); diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index 5f8085fdda..a200c685cc 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -368,8 +368,11 @@ void HmdDisplayPlugin::updateFrameData() { auto compositorHelper = DependencyManager::get(); glm::mat4 modelMat = compositorHelper->getModelTransform().getMatrix(); - std::array handGlowPoints{ { vec2(-1), vec2(-1) } }; - vec2 extraGlowPoint(-1); + static const float OUT_OF_BOUNDS = -1; + std::array handGlowPoints { { vec2(OUT_OF_BOUNDS), vec2(OUT_OF_BOUNDS) } }; + vec2 extraGlowPoint(OUT_OF_BOUNDS); + + float uiRadius = compositorHelper->getHmdUiRadius(); // compute the glow point interesections for (size_t i = 0; i < NUMBER_OF_HANDS; ++i) { @@ -396,9 +399,6 @@ void HmdDisplayPlugin::updateFrameData() { } castStart += glm::quat_cast(model) * grabPointOffset; - // FIXME fetch the actual UI radius from... somewhere? - float uiRadius = 1.0f; - // Find the intersection of the laser with he UI and use it to scale the model matrix float distance; if (!glm::intersectRaySphere(castStart, castDirection, diff --git a/scripts/system/controllers/handControllerPointer.js b/scripts/system/controllers/handControllerPointer.js index ae4d3d1f78..c2deaa2fac 100644 --- a/scripts/system/controllers/handControllerPointer.js +++ b/scripts/system/controllers/handControllerPointer.js @@ -455,10 +455,10 @@ function clearSystemLaser() { function setColoredLaser() { // answer trigger state if lasers supported, else falsey. var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW; - if (!HMD.isHandControllerAvailable()){ + if (!HMD.isHandControllerAvailable()) { var position = MyAvatar.getHeadPosition(); var direction = Quat.getUp(Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }))); - return HMD.setExtraLaser(position,true, color, direction); + return HMD.setExtraLaser(position, true, color, direction); } return HMD.setHandLasers(activeHudLaser, true, color, SYSTEM_LASER_DIRECTION) && activeTrigger.state; @@ -510,7 +510,7 @@ function update() { var color = (activeTrigger.state === 'full') ? LASER_TRIGGER_COLOR_XYZW : LASER_SEARCH_COLOR_XYZW; var position = MyAvatar.getHeadPosition(); var direction = Quat.getUp(Quat.multiply(MyAvatar.headOrientation, Quat.angleAxis(-90, { x: 1, y: 0, z: 0 }))); - HMD.setExtraLaser(position,true, color, direction); + HMD.setExtraLaser(position, true, color, direction); } }