Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 05:07:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed left handed menu option

Browse source
This commit is contained in:
barnold1953 2014-06-12 12:25:22 -07:00
parent 18543ff313
commit bc293071d6
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Menu.cpp
View file

@ -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");

1
interface/src/Menu.h
View file

@ -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";

3
interface/src/devices/SixenseManager.cpp
View file

@ -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.

10
interface/src/ui/ApplicationOverlay.cpp
View file

@ -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;
}