Moved to SixenseManager
Showing the changes to interface/src/devices/SixenseManager.cpp (1 of 4 files). Show all
Unified · Split
| @@ -301,7 +301,7 @@ const float RANGE_MULT = (MAX_PIXEL_RANGE_MULT - MIN_PIXEL_RANGE_MULT) * 0.01; · 300 unmodified lines | ||
| 301 | 301 | //Returns a multiplier to be applied to the cursor range for the controllers |
| 302 | 302 | float SixenseManager::getCursorPixelRangeMult() const { |
| 303 | 303 | //scales (0,100) to (MINIMUM_PIXEL_RANGE_MULT, MAXIMUM_PIXEL_RANGE_MULT) |
| 304 | − return Menu::getInstance()->getSixenseReticleMoveSpeed() * RANGE_MULT + MIN_PIXEL_RANGE_MULT; | |
| 304 | + return _reticleMoveSpeed * RANGE_MULT + MIN_PIXEL_RANGE_MULT; | |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | #ifdef HAVE_SIXENSE |
| @@ -459,7 +459,7 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) { · 151 unmodified lines | ||
| 459 | 459 | |
| 460 | 460 | unsigned int deviceID = index == 0 ? CONTROLLER_0_EVENT : CONTROLLER_1_EVENT; |
| 461 | 461 | |
| 462 | − if (Menu::getInstance()->getInvertSixenseButtons()) { | |
| 462 | + if (_invertButtons) { | |
| 463 | 463 | bumperButton = Qt::LeftButton; |
| 464 | 464 | triggerButton = Qt::RightButton; |
| 465 | 465 | } else { |