History

Added menu options for sixense mouse input

barnold1953 committed 12 years ago

Commit 2fec7401 parent eff09764 files · +45 −8Browse files

Showing the changes to interface/src/ui/ApplicationOverlay.cpp (1 of 4 files). Show all

Unified · Split

interface/src/ui/ApplicationOverlay.cpp+8−2
@@ -45,7 +45,12 @@ void renderControllerPointer() · 44 unmodified lines
45 int numberOfPalms = handData->getNumPalms();45 int numberOfPalms = handData->getNumPalms();
46 46
47 47
48 int palmIndex = 3;48 int palmIndex;
49 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseLeftHanded)) {
50 palmIndex = 2;
51 } else {
52 palmIndex = 3;
53 }
49 const PalmData* palmData = NULL;54 const PalmData* palmData = NULL;
50 55
51 if (palmIndex >= handData->getPalms().size()) {56 if (palmIndex >= handData->getPalms().size()) {
@@ -326,7 +331,8 @@ void ApplicationOverlay::renderOverlay(bool renderToTexture) { · 274 unmodified lines
326 glVertex2i(mouseX + crossPad, mouseY - pointerHeight);331 glVertex2i(mouseX + crossPad, mouseY - pointerHeight);
327 332
328 glEnd();333 glEnd();
329 } else { //only render controller pointer if we aren't already rendering a mouse pointer334 } else if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) {
335 //only render controller pointer if we aren't already rendering a mouse pointer
330 renderControllerPointer();336 renderControllerPointer();
331 }337 }
332 glPopMatrix();338 glPopMatrix();