From f86518df081460f2e06fcde2197b89d455c90f63 Mon Sep 17 00:00:00 2001 From: Flame Soulis Date: Wed, 24 Oct 2018 07:59:43 -0400 Subject: [PATCH 1/3] Changed QString to char* for SpacemouseManager --- plugins/hifiSpacemouse/src/SpacemouseManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp index 4641799b79..220524f303 100644 --- a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp +++ b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp @@ -20,7 +20,7 @@ #include -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 From f25820c81a1bedf5ecc88b667b9ea25ae3e2dea0 Mon Sep 17 00:00:00 2001 From: Flame Soulis Date: Wed, 24 Oct 2018 08:24:42 -0400 Subject: [PATCH 2/3] Add destroyInputPlugins() --- plugins/hifiSpacemouse/src/SpacemouseProvider.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/hifiSpacemouse/src/SpacemouseProvider.cpp b/plugins/hifiSpacemouse/src/SpacemouseProvider.cpp index c623f77d73..354b4711a3 100644 --- a/plugins/hifiSpacemouse/src/SpacemouseProvider.cpp +++ b/plugins/hifiSpacemouse/src/SpacemouseProvider.cpp @@ -38,6 +38,10 @@ public: return _inputPlugins; } + virtual void destroyInputPlugins() override { + _inputPlugins.clear(); + } + private: InputPluginList _inputPlugins; }; From f1f5f576506db2983509ae63e559d426730d3218 Mon Sep 17 00:00:00 2001 From: Flame Soulis Date: Wed, 24 Oct 2018 08:52:34 -0400 Subject: [PATCH 3/3] Re-enabled all Axis (by popular request) --- plugins/hifiSpacemouse/src/SpacemouseManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp index 220524f303..e5fd2a3501 100644 --- a/plugins/hifiSpacemouse/src/SpacemouseManager.cpp +++ b/plugins/hifiSpacemouse/src/SpacemouseManager.cpp @@ -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"), };