From 3dfc7251010af6fe8fee69fc7477d3724871e77a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Sun, 18 Jan 2015 20:37:30 -0800 Subject: [PATCH] Move toggleSixense out of #if HAVE_SIXENSE --- interface/src/devices/SixenseManager.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp index 508e0ad785..d11d527904 100644 --- a/interface/src/devices/SixenseManager.cpp +++ b/interface/src/devices/SixenseManager.cpp @@ -304,6 +304,15 @@ float SixenseManager::getCursorPixelRangeMult() const { return _reticleMoveSpeed * RANGE_MULT + MIN_PIXEL_RANGE_MULT; } +void SixenseManager::toggleSixense(bool shouldEnable) { + if (shouldEnable && !isInitialized()) { + initialize(); + setFilter(Menu::getInstance()->isOptionChecked(MenuOption::FilterSixense)); + setLowVelocityFilter(Menu::getInstance()->isOptionChecked(MenuOption::LowVelocityFilter)); + } + setIsEnabled(shouldEnable); +} + #ifdef HAVE_SIXENSE // the calibration sequence is: @@ -568,14 +577,5 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { } } -void SixenseManager::toggleSixense(bool shouldEnable) { - if (shouldEnable && !isInitialized()) { - initialize(); - setFilter(Menu::getInstance()->isOptionChecked(MenuOption::FilterSixense)); - setLowVelocityFilter(Menu::getInstance()->isOptionChecked(MenuOption::LowVelocityFilter)); - } - setIsEnabled(shouldEnable); -} - #endif // HAVE_SIXENSE