From d589812c5257c556f8cd804e2ffd37ee571c7bc0 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 4 Oct 2016 21:35:55 -0700 Subject: [PATCH] Update hand controller detection --- plugins/hifiSixense/src/SixenseManager.h | 4 +++- plugins/oculus/src/OculusControllerManager.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/hifiSixense/src/SixenseManager.h b/plugins/hifiSixense/src/SixenseManager.h index 56d3c6bc4d..c77569474e 100644 --- a/plugins/hifiSixense/src/SixenseManager.h +++ b/plugins/hifiSixense/src/SixenseManager.h @@ -31,7 +31,9 @@ public: virtual const QString& getName() const override { return NAME; } virtual const QString& getID() const override { return HYDRA_ID_STRING; } - bool isHandController() const override { return true; } + // Sixense always seems to initialize even if the hydras are not present. Is there + // a way we can properly detect whether the hydras are present? + bool isHandController() const override { return false; } virtual bool activate() override; virtual void deactivate() override; diff --git a/plugins/oculus/src/OculusControllerManager.h b/plugins/oculus/src/OculusControllerManager.h index 4c236a375d..234acd7db2 100644 --- a/plugins/oculus/src/OculusControllerManager.h +++ b/plugins/oculus/src/OculusControllerManager.h @@ -26,7 +26,7 @@ public: bool isSupported() const override; const QString& getName() const override { return NAME; } - bool isHandController() const override { return true; } + bool isHandController() const override { return _touch != nullptr; } bool activate() override; void deactivate() override;