diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 6cf99418e3..0c6a3efa24 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -382,7 +382,6 @@ Menu::Menu() : QMenu* sixenseOptionsMenu = developerMenu->addMenu("Sixense Options"); addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseMouseInput, 0, true); - addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseLeftHanded, 0, false); addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, MenuOption::SixenseInvertInputButtons, 0, false); QMenu* handOptionsMenu = developerMenu->addMenu("Hand Options"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 8415fb68c4..47ada75287 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -400,7 +400,6 @@ namespace MenuOption { const QString SettingsImport = "Import Settings"; const QString SimpleShadows = "Simple"; const QString SixenseInvertInputButtons = "Invert Sixense Mouse Input Buttons"; - const QString SixenseLeftHanded = "Left Handed Sixense Mouse Input"; const QString SixenseMouseInput = "Enable Sixense Mouse Input"; const QString ShowBordersVoxelNodes = "Show Voxel Nodes"; const QString ShowBordersModelNodes = "Show Model Nodes"; diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp index 37bad28093..bce55ae362 100644 --- a/interface/src/devices/SixenseManager.cpp +++ b/interface/src/devices/SixenseManager.cpp @@ -118,10 +118,7 @@ void SixenseManager::update(float deltaTime) { // Emulate the mouse so we can use scripts if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) { - // Check if we are on the correct palm - //if ((Menu::getInstance()->isOptionChecked(MenuOption::SixenseLeftHanded) && numActiveControllers == 1) || numActiveControllers == 2) { emulateMouse(palm, numActiveControllers - 1); - //} } // NOTE: Sixense API returns pos data in millimeters but we IMMEDIATELY convert to meters. diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 83b6dde93b..873f7c29f3 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -44,14 +44,7 @@ void ApplicationOverlay::renderControllerPointer() { const HandData* handData = Application::getInstance()->getAvatar()->getHandData(); int numberOfPalms = handData->getNumPalms(); - - int palmIndex; - /*if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLeftHanded)) { - palmIndex = 2; - } else { - palmIndex = 3; - }*/ - for (palmIndex = 2; palmIndex < 4; palmIndex++) { + for (int palmIndex = 2; palmIndex < 4; palmIndex++) { const PalmData* palmData = NULL; if (palmIndex >= handData->getPalms().size()) { @@ -76,6 +69,7 @@ void ApplicationOverlay::renderControllerPointer() { int mouseX = cursorRange * xAngle; int mouseY = cursorRange * yAngle; + //If the cursor is out of the screen then don't render it if (mouseX < 0 || mouseX >= glWidget->width() || mouseY < 0 || mouseY >= glWidget->height()) { continue; }