From 3149c3e16c0671a8428390b28e3614f3ca170c90 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Tue, 25 Jul 2017 10:16:50 -0700 Subject: [PATCH] warnings --- interface/src/scripting/HMDScriptingInterface.cpp | 2 +- interface/src/ui/overlays/Overlay.cpp | 4 ++-- .../src/display-plugins/hmd/HmdDisplayPlugin.cpp | 9 --------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp index af3c7c3d67..93c3a7652e 100644 --- a/interface/src/scripting/HMDScriptingInterface.cpp +++ b/interface/src/scripting/HMDScriptingInterface.cpp @@ -91,7 +91,7 @@ void HMDScriptingInterface::activateHMDHandMouse() { void HMDScriptingInterface::deactivateHMDHandMouse() { QWriteLocker lock(&_hmdHandMouseLock); - _hmdHandMouseCount = std::max(--_hmdHandMouseCount, 0); + _hmdHandMouseCount = std::max(_hmdHandMouseCount - 1, 0); if (_hmdHandMouseCount == 0) { auto offscreenUi = DependencyManager::get(); offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", false); diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp index 868cdf110b..3afe7d76ca 100644 --- a/interface/src/ui/overlays/Overlay.cpp +++ b/interface/src/ui/overlays/Overlay.cpp @@ -29,8 +29,8 @@ Overlay::Overlay() : _alphaPulse(0.0f), _colorPulse(0.0f), _color(DEFAULT_OVERLAY_COLOR), - _drawHUDLayer(false), _visible(true), + _drawHUDLayer(false), _anchor(NO_ANCHOR) { } @@ -48,8 +48,8 @@ Overlay::Overlay(const Overlay* overlay) : _alphaPulse(overlay->_alphaPulse), _colorPulse(overlay->_colorPulse), _color(overlay->_color), - _drawHUDLayer(overlay->_drawHUDLayer), _visible(overlay->_visible), + _drawHUDLayer(overlay->_drawHUDLayer), _anchor(overlay->_anchor) { } diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index fe109e7bc9..ab53316010 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -42,17 +42,10 @@ static const bool DEFAULT_MONO_VIEW = true; static const bool DEFAULT_DISABLE_PREVIEW = false; #endif static const glm::mat4 IDENTITY_MATRIX; -static const size_t NUMBER_OF_HANDS = 2; //#define LIVE_SHADER_RELOAD 1 extern glm::vec3 getPoint(float yaw, float pitch); -struct HandLaserData { - vec4 p1; - vec4 p2; - vec4 color; -}; - static QString readFile(const QString& filename) { QFile file(filename); file.open(QFile::Text | QFile::ReadOnly); @@ -115,8 +108,6 @@ void HmdDisplayPlugin::internalDeactivate() { Parent::internalDeactivate(); } -static const int32_t LINE_DATA_SLOT = 1; - void HmdDisplayPlugin::customizeContext() { Parent::customizeContext(); _overlayRenderer.build();