From 73342b2758c1ae89188186a1b23b5e2b8b16664e Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Wed, 18 May 2016 09:38:44 -0700 Subject: [PATCH] PR feedback --- plugins/hifiNeuron/src/NeuronPlugin.cpp | 2 +- plugins/hifiSpacemouse/src/SpacemouseManager.cpp | 6 ++++-- plugins/openvr/src/ViveControllerManager.cpp | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/hifiNeuron/src/NeuronPlugin.cpp b/plugins/hifiNeuron/src/NeuronPlugin.cpp index 41c0eb0d4e..0a4bc7f8d2 100644 --- a/plugins/hifiNeuron/src/NeuronPlugin.cpp +++ b/plugins/hifiNeuron/src/NeuronPlugin.cpp @@ -458,7 +458,7 @@ void NeuronPlugin::InputDevice::update(float deltaTime, const controller::InputC const glm::vec3& pos = joints[i].pos; const glm::vec3& rotEuler = joints[i].euler; - if ((Vectors::ZERO == pos && Vectors::ZERO == rotEuler)) { + if (Vectors::ZERO == pos && Vectors::ZERO == rotEuler) { _poseStateMap[poseIndex] = controller::Pose(); continue; } diff --git a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp index 8b584df366..3d9b93ff44 100644 --- a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp +++ b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp @@ -11,6 +11,10 @@ #include "SpacemouseManager.h" +#ifdef Q_OS_WIN +#include +#endif + #include #include @@ -171,8 +175,6 @@ void SpacemouseDevice::update(float deltaTime, const controller::InputCalibratio #ifdef Q_OS_WIN -#include - bool SpacemouseManager::nativeEventFilter(const QByteArray& eventType, void* message, long* result) { MSG* msg = static_cast< MSG * >(message); return RawInputEventFilter(message, result); diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp index 5ca8f03ad7..12567b10d1 100644 --- a/plugins/openvr/src/ViveControllerManager.cpp +++ b/plugins/openvr/src/ViveControllerManager.cpp @@ -213,7 +213,6 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch& void ViveControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { - _inputDevice->update(deltaTime, inputCalibrationData); auto userInputMapper = DependencyManager::get(); // because update mutates the internal state we need to lock