From bf70ae4724fd16cd04d220d0a76a5481bc800929 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 6 Nov 2015 15:59:00 -0800 Subject: [PATCH] PR feedback --- .../src/display-plugins/Logging.cpp | 11 +++++++++++ .../src/display-plugins/Logging.h | 16 ++++++++++++++++ .../src/display-plugins/openvr/OpenVrHelpers.cpp | 8 +++++--- .../src/input-plugins/KeyboardMouseDevice.h | 10 ++++------ .../src/input-plugins/SixenseManager.h | 4 +--- .../src/input-plugins/ViveControllerManager.h | 2 -- tests/controllers/src/main.cpp | 2 +- 7 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 libraries/display-plugins/src/display-plugins/Logging.cpp create mode 100644 libraries/display-plugins/src/display-plugins/Logging.h diff --git a/libraries/display-plugins/src/display-plugins/Logging.cpp b/libraries/display-plugins/src/display-plugins/Logging.cpp new file mode 100644 index 0000000000..00cd4cf0f9 --- /dev/null +++ b/libraries/display-plugins/src/display-plugins/Logging.cpp @@ -0,0 +1,11 @@ +// +// Created by Bradley Austin Davis 2015/10/11 +// Copyright 2015 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#include "Logging.h" + +Q_LOGGING_CATEGORY(displayPlugins, "hifi.plugins.display") diff --git a/libraries/display-plugins/src/display-plugins/Logging.h b/libraries/display-plugins/src/display-plugins/Logging.h new file mode 100644 index 0000000000..79b20b5dcc --- /dev/null +++ b/libraries/display-plugins/src/display-plugins/Logging.h @@ -0,0 +1,16 @@ +// +// Created by Bradley Austin Davis 2015/10/11 +// Copyright 2015 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_DisplayPlugins_Logging_h +#define hifi_DisplayPlugins_Logging_h + +#include + +Q_DECLARE_LOGGING_CATEGORY(displayPlugins) + +#endif diff --git a/libraries/display-plugins/src/display-plugins/openvr/OpenVrHelpers.cpp b/libraries/display-plugins/src/display-plugins/openvr/OpenVrHelpers.cpp index 44d30962bd..f8e810beaf 100644 --- a/libraries/display-plugins/src/display-plugins/openvr/OpenVrHelpers.cpp +++ b/libraries/display-plugins/src/display-plugins/openvr/OpenVrHelpers.cpp @@ -14,6 +14,8 @@ #include #include +#include "../Logging.h" + using Mutex = std::mutex; using Lock = std::unique_lock; @@ -28,13 +30,13 @@ vr::IVRSystem* acquireOpenVrSystem() { if (hmdPresent) { Lock lock(mutex); if (!activeHmd) { - qDebug() << "openvr: No vr::IVRSystem instance active, building"; + qCDebug(displayPlugins) << "openvr: No vr::IVRSystem instance active, building"; vr::HmdError eError = vr::HmdError_None; activeHmd = vr::VR_Init(&eError); - qDebug() << "openvr display: HMD is " << activeHmd << " error is " << eError; + qCDebug(displayPlugins) << "openvr display: HMD is " << activeHmd << " error is " << eError; } if (activeHmd) { - qDebug() << "openvr: incrementing refcount"; + qCDebug(displayPlugins) << "openvr: incrementing refcount"; ++refCount; } } diff --git a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h index b0578e3a99..4abdc44478 100644 --- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h +++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.h @@ -64,12 +64,6 @@ public: TOUCH_BUTTON_PRESS = TOUCH_AXIS_Y_NEG + 1, }; - KeyboardMouseDevice() {} - - virtual ~KeyboardMouseDevice() {} - - controller::InputDevice::Pointer getInputDevice() { return _inputDevice; } - // Plugin functions virtual bool isSupported() const override { return true; } virtual bool isJointController() const override { return false; } @@ -116,6 +110,10 @@ protected: friend class KeyboardMouseDevice; }; +public: + const std::shared_ptr& getInputDevice() const { return _inputDevice; } + +protected: QPoint _lastCursor; QPoint _mousePressAt; glm::vec2 _lastTouch; diff --git a/libraries/input-plugins/src/input-plugins/SixenseManager.h b/libraries/input-plugins/src/input-plugins/SixenseManager.h index 7a686dc423..062a27390c 100644 --- a/libraries/input-plugins/src/input-plugins/SixenseManager.h +++ b/libraries/input-plugins/src/input-plugins/SixenseManager.h @@ -47,9 +47,7 @@ const bool DEFAULT_INVERT_SIXENSE_MOUSE_BUTTONS = false; class SixenseManager : public InputPlugin { Q_OBJECT public: - SixenseManager() {} - virtual ~SixenseManager() {} - + // Plugin functions virtual bool isSupported() const override; virtual bool isJointController() const override { return true; } diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h index a925733327..02bdecb10a 100644 --- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.h +++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.h @@ -31,8 +31,6 @@ namespace vr { class ViveControllerManager : public InputPlugin { Q_OBJECT public: - ViveControllerManager() {} - virtual ~ViveControllerManager() {} // Plugin functions virtual bool isSupported() const override; diff --git a/tests/controllers/src/main.cpp b/tests/controllers/src/main.cpp index 6cc2cfc6eb..664a894e44 100644 --- a/tests/controllers/src/main.cpp +++ b/tests/controllers/src/main.cpp @@ -132,7 +132,7 @@ int main(int argc, char** argv) { inputPlugin->activate(); auto userInputMapper = DependencyManager::get(); if (name == KeyboardMouseDevice::NAME) { - userInputMapper->registerDevice(dynamic_cast(inputPlugin.get())->getInputDevice()); + userInputMapper->registerDevice(std::dynamic_pointer_cast(inputPlugin)->getInputDevice()); } inputPlugin->pluginUpdate(0, false); }