Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR feedback

Browse source
This commit is contained in:
Brad Davis 2016-05-18 09:38:44 -07:00
parent 07562f72af
commit 73342b2758
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/hifiNeuron/src/NeuronPlugin.cpp
View file

@ -458,7 +458,7 @@ void NeuronPlugin::InputDevice::update(float deltaTime, const controller::InputC
const glm::vec3& pos = joints[i].pos; const glm::vec3& pos = joints[i].pos;
const glm::vec3& rotEuler = joints[i].euler; 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(); _poseStateMap[poseIndex] = controller::Pose();
continue; continue;
} }

6
plugins/hifiSpacemouse/src/SpacemouseManager.cpp
View file

@ -11,6 +11,10 @@
#include "SpacemouseManager.h" #include "SpacemouseManager.h"
#ifdef Q_OS_WIN
#include <VersionHelpers.h>
#endif
#include <UserActivityLogger.h> #include <UserActivityLogger.h>
#include <PathUtils.h> #include <PathUtils.h>
@ -171,8 +175,6 @@ void SpacemouseDevice::update(float deltaTime, const controller::InputCalibratio
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <VersionHelpers.h>
bool SpacemouseManager::nativeEventFilter(const QByteArray& eventType, void* message, long* result) { bool SpacemouseManager::nativeEventFilter(const QByteArray& eventType, void* message, long* result) {
MSG* msg = static_cast< MSG * >(message); MSG* msg = static_cast< MSG * >(message);
return RawInputEventFilter(message, result); return RawInputEventFilter(message, result);

1
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -213,7 +213,6 @@ void ViveControllerManager::renderHand(const controller::Pose& pose, gpu::Batch&
void ViveControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { void ViveControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
_inputDevice->update(deltaTime, inputCalibrationData);
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
// because update mutates the internal state we need to lock // because update mutates the internal state we need to lock