Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -2838,7 +2838,7 @@ void Application::emulateMouse(Hand* hand, float click, float shift, int index) · 2837 unmodified lines | |||
| 2838 | 2838 | ||
| 2839 | unsigned int deviceID = index == 0 ? CONTROLLER_0_EVENT : CONTROLLER_1_EVENT; | 2839 | unsigned int deviceID = index == 0 ? CONTROLLER_0_EVENT : CONTROLLER_1_EVENT; |
| 2840 | 2840 | ||
| 2841 | if (Menu::getInstance()->isOptionChecked(MenuOption::HandLasers) || qApp->isHMDMode()) { | 2841 | if (qApp->isHMDMode()) { |
| 2842 | pos = qApp->getApplicationCompositor().getPalmClickLocation(palm); | 2842 | pos = qApp->getApplicationCompositor().getPalmClickLocation(palm); |
| 2843 | } | 2843 | } |
| 2844 | else { | 2844 | else { |
| @@ -3551,11 +3551,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 706 unmodified lines | |||
| 3551 | sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems); | 3551 | sceneInterface->setEngineDrawnOverlay3DItems(engineRC->_numDrawnOverlay3DItems); |
| 3552 | } | 3552 | } |
| 3553 | 3553 | ||
| 3554 | //Render the sixense lasers | ||
| 3555 | if (Menu::getInstance()->isOptionChecked(MenuOption::HandLasers)) { | ||
| 3556 | _myAvatar->renderLaserPointers(*renderArgs->_batch); | ||
| 3557 | } | ||
| 3558 | |||
| 3559 | if (!selfAvatarOnly) { | 3554 | if (!selfAvatarOnly) { |
| 3560 | // give external parties a change to hook in | 3555 | // give external parties a change to hook in |
| 3561 | { | 3556 | { |