From f047c2dff09fd586b9d7f790a1e56c1881768127 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 29 Sep 2014 17:08:06 -0700 Subject: [PATCH 1/2] have OS X hydra support be disabled by default --- interface/src/Menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 1da85aad16..d2ae9160ad 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -434,7 +434,7 @@ Menu::Menu() : #ifdef __APPLE__ addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseEnabled, - 0, true, + 0, false, this, SLOT(toggleSixense(bool))); #endif From e512b05e621293f75bcbab45f104f0918c373e91 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 29 Sep 2014 17:28:50 -0700 Subject: [PATCH 2/2] add extra debug for hydra library initialization --- interface/src/devices/SixenseManager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp index 7823d6e840..28b125b6da 100644 --- a/interface/src/devices/SixenseManager.cpp +++ b/interface/src/devices/SixenseManager.cpp @@ -100,6 +100,8 @@ void SixenseManager::initialize() { _sixenseLibrary = new QLibrary(SIXENSE_LIBRARY_NAME); } + qDebug() << "Initializing sixense library for hydra support - libsixense_x64.dylib load state is" + << _sixenseLibrary->isLoaded(); SixenseBaseFunction sixenseInit = (SixenseBaseFunction) _sixenseLibrary->resolve("sixenseInit"); #endif