Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 09:13:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14272 from FlameSoulis/fix/spacenavigator

Browse source 
Update Spacemouse plugin + Proposal to main build
This commit is contained in:
Jeff Clinton 2018-11-13 10:59:11 -08:00 committed by GitHub
commit 6bd08325ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
#include <controllers/UserInputMapper.h>
const QString SpacemouseManager::NAME { "Spacemouse" };
const char* SpacemouseManager::NAME { "Spacemouse" };
const float MAX_AXIS = 75.0f; // max forward = 2x speed
#define LOGITECH_VENDOR_ID 0x46d
@ -116,8 +116,8 @@ controller::Input::NamedVector SpacemouseDevice::getAvailableInputs() const {
makePair(TRANSLATE_X, "TranslateX"),
makePair(TRANSLATE_Y, "TranslateY"),
makePair(TRANSLATE_Z, "TranslateZ"),
//makePair(ROTATE_X, "RotateX"),
//makePair(ROTATE_Y, "RotateY"),
makePair(ROTATE_X, "RotateX"),
makePair(ROTATE_Y, "RotateY"),
makePair(ROTATE_Z, "RotateZ"),
};

4
plugins/hifiSpacemouse/src/SpacemouseProvider.cpp
View file

@ -38,6 +38,10 @@ public:
return _inputPlugins;
}
virtual void destroyInputPlugins() override {
_inputPlugins.clear();
}
private:
InputPluginList _inputPlugins;
};