From ade0862948ae8d010d8450b6d4056716348e388d Mon Sep 17 00:00:00 2001 From: EdgarPironti Date: Wed, 4 Nov 2015 00:49:40 -0800 Subject: [PATCH] Spacemouse fixes --- .../controllers/Spacemouse/spacemouseExample.js | 8 ++++---- interface/resources/controllers/spacemouse.json | 4 ++-- .../src/input-plugins/SpacemouseManager.cpp | 14 +++----------- .../src/input-plugins/SpacemouseManager.h | 9 ++------- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/examples/controllers/Spacemouse/spacemouseExample.js b/examples/controllers/Spacemouse/spacemouseExample.js index 46ccd80fa7..92e89055b7 100644 --- a/examples/controllers/Spacemouse/spacemouseExample.js +++ b/examples/controllers/Spacemouse/spacemouseExample.js @@ -45,9 +45,9 @@ function update(deltaTime) { print("- Controller RZ: " + Controller.getValue(Controller.Standard.LX)); } - if(Controller.getValue(Controller.Standard.LT) != 0){ + if(Controller.getValue(Controller.Standard.LB) != 0){ toggleFirstMove(); - print("- Controller LEFTB: " + Controller.getValue(Controller.Standard.LT)); + print("- Controller LEFTB: " + Controller.getValue(Controller.Standard.LB)); } if(Controller.getValue(Controller.Standard.RY) != 0){ @@ -60,9 +60,9 @@ function update(deltaTime) { print("- Controller TX: " + Controller.getValue(Controller.Standard.RX)); } - if(Controller.getValue(Controller.Standard.RT) != 0){ + if(Controller.getValue(Controller.Standard.RB) != 0){ toggleFirstMove(); - print("- Controller RIGHTB: " + Controller.getValue(Controller.Standard.RT)); + print("- Controller RIGHTB: " + Controller.getValue(Controller.Standard.RB)); } firstmove = 1; diff --git a/interface/resources/controllers/spacemouse.json b/interface/resources/controllers/spacemouse.json index e02d0d4101..adcfef71a6 100644 --- a/interface/resources/controllers/spacemouse.json +++ b/interface/resources/controllers/spacemouse.json @@ -8,8 +8,8 @@ { "from": "Spacemouse.RotateZ", "to": "Standard.LX" }, - { "from": "Spacemouse.LeftButton", "to": "Standard.LT" }, - { "from": "Spacemouse.RightButton", "to": "Standard.RT" } + { "from": "Spacemouse.LeftButton", "to": "Standard.LB" }, + { "from": "Spacemouse.RightButton", "to": "Standard.RB" } ] } diff --git a/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp b/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp index 3f68be8039..9c1307a18e 100644 --- a/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp +++ b/libraries/input-plugins/src/input-plugins/SpacemouseManager.cpp @@ -21,7 +21,7 @@ const float MAX_AXIS = 75.0f; // max forward = 2x speed -static std::shared_ptr instance = NULL; +static std::shared_ptr instance; SpacemouseDevice::SpacemouseDevice() : InputDevice("Spacemouse") { @@ -120,9 +120,9 @@ void SpacemouseDevice::update(float deltaTime, bool jointsCaptured) { SpacemouseManager& SpacemouseManager::getInstance() { static SpacemouseManager sharedInstance; - if (instance == NULL){ + if (instance == nullptr) { new SpacemouseDevice(); - } + } return sharedInstance; } @@ -318,14 +318,12 @@ void SpacemouseManager::Move3d(HANDLE device, std::vector& motionData) { //Called when a 3D mouse key is pressed void SpacemouseManager::On3dmouseKeyDown(HANDLE device, int virtualKeyCode) { Q_UNUSED(device); - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); instance->setButton(virtualKeyCode); } //Called when a 3D mouse key is released void SpacemouseManager::On3dmouseKeyUp(HANDLE device, int virtualKeyCode) { Q_UNUSED(device); - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); instance->setButton(0); } @@ -858,8 +856,6 @@ void SpacemouseManager::init() { // ...or use this to take over system-wide fConnexionClientID = RegisterConnexionClient(kConnexionClientWildcard, NULL, kConnexionClientModeTakeOver, kConnexionMaskAll); - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); - //memcpy(&spacemousedevice.clientId, &fConnexionClientID, (long)sizeof(int)); memcpy(&instance->clientId, &fConnexionClientID, (long)sizeof(int)); // A separate API call is required to capture buttons beyond the first 8 @@ -887,7 +883,6 @@ void SpacemouseManager::destroy() { } CleanupConnexionHandlers(); fConnexionClientID = 0; - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); if (instance->getDeviceID() != controller::Input::INVALID_DEVICE) { auto userInputMapper = DependencyManager::get(); userInputMapper->removeDevice(instance->getDeviceID()); @@ -897,7 +892,6 @@ void SpacemouseManager::destroy() { } void DeviceAddedHandler(unsigned int connection) { - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); if (instance->getDeviceID() == controller::Input::INVALID_DEVICE) { qCWarning(interfaceapp) << "Spacemouse device added "; auto userInputMapper = DependencyManager::get(); @@ -907,7 +901,6 @@ void DeviceAddedHandler(unsigned int connection) { } void DeviceRemovedHandler(unsigned int connection) { - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); if (instance->getDeviceID() != controller::Input::INVALID_DEVICE) { qCWarning(interfaceapp) << "Spacemouse device removed"; auto userInputMapper = DependencyManager::get(); @@ -934,7 +927,6 @@ void MessageHandler(unsigned int connection, unsigned int messageType, void *mes case kConnexionMsgDeviceState: state = (SpacemouseDeviceState*)messageArgument; if (state->client == fConnexionClientID) { - //SpacemouseDevice& spacemousedevice = SpacemouseDevice::getInstance(); instance->cc_position = { state->axis[0], state->axis[1], state->axis[2] }; instance->cc_rotation = { state->axis[3], state->axis[4], state->axis[5] }; diff --git a/libraries/input-plugins/src/input-plugins/SpacemouseManager.h b/libraries/input-plugins/src/input-plugins/SpacemouseManager.h index 0d6556d059..26e0155825 100644 --- a/libraries/input-plugins/src/input-plugins/SpacemouseManager.h +++ b/libraries/input-plugins/src/input-plugins/SpacemouseManager.h @@ -89,8 +89,7 @@ private: }; class SpacemouseManager : public QObject, public QAbstractNativeEventFilter { -//class SpacemouseManager : public InputPlugin, public controller::InputDevice { - + Q_OBJECT public: SpacemouseManager() {}; @@ -118,10 +117,7 @@ public: } public slots: - void toggleSpacemouse(bool shouldEnable); - - //std::shared_ptr getDevice(); - + void toggleSpacemouse(bool shouldEnable); signals: void Move3d(std::vector& motionData); @@ -193,7 +189,6 @@ class SpacemouseDevice : public QObject, public controller::InputDevice { Q_OBJECT public: - //static SpacemouseDevice& getInstance(); SpacemouseDevice(); enum PositionChannel { TRANSLATE_X,