CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
Showing the changes to interface/src/ui/ApplicationOverlay.cpp (1 of 11 files). Show all
Unified · Split
| @@ -139,6 +139,7 @@ ApplicationOverlay::ApplicationOverlay() : · 138 unmodified lines | |||
| 139 | _alpha(1.0f), | 139 | _alpha(1.0f), |
| 140 | _oculusUIRadius(1.0f), | 140 | _oculusUIRadius(1.0f), |
| 141 | _crosshairTexture(0), | 141 | _crosshairTexture(0), |
| 142 | _magnifier(true), | ||
| 142 | _previousBorderWidth(-1), | 143 | _previousBorderWidth(-1), |
| 143 | _previousBorderHeight(-1), | 144 | _previousBorderHeight(-1), |
| 144 | _previousMagnifierBottomLeft(), | 145 | _previousMagnifierBottomLeft(), |
| @@ -559,7 +560,7 @@ void ApplicationOverlay::renderPointers() { · 414 unmodified lines | |||
| 559 | 560 | ||
| 560 | _reticlePosition[MOUSE] = position; | 561 | _reticlePosition[MOUSE] = position; |
| 561 | _reticleActive[MOUSE] = true; | 562 | _reticleActive[MOUSE] = true; |
| 562 | _magActive[MOUSE] = true; | 563 | _magActive[MOUSE] = _magnifier; |
| 563 | _reticleActive[LEFT_CONTROLLER] = false; | 564 | _reticleActive[LEFT_CONTROLLER] = false; |
| 564 | _reticleActive[RIGHT_CONTROLLER] = false; | 565 | _reticleActive[RIGHT_CONTROLLER] = false; |
| 565 | } else if (qApp->getLastMouseMoveWasSimulated() && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) { | 566 | } else if (qApp->getLastMouseMoveWasSimulated() && Menu::getInstance()->isOptionChecked(MenuOption::SixenseMouseInput)) { |
| @@ -718,6 +719,9 @@ void ApplicationOverlay::renderPointersOculus(const glm::vec3& eyePos) { · 152 unmodified lines | |||
| 718 | 719 | ||
| 719 | //Renders a small magnification of the currently bound texture at the coordinates | 720 | //Renders a small magnification of the currently bound texture at the coordinates |
| 720 | void ApplicationOverlay::renderMagnifier(glm::vec2 magPos, float sizeMult, bool showBorder) { | 721 | void ApplicationOverlay::renderMagnifier(glm::vec2 magPos, float sizeMult, bool showBorder) { |
| 722 | if (!_magnifier) { | ||
| 723 | return; | ||
| 724 | } | ||
| 721 | auto glCanvas = DependencyManager::get<GLCanvas>(); | 725 | auto glCanvas = DependencyManager::get<GLCanvas>(); |
| 722 | 726 | ||
| 723 | const int widgetWidth = glCanvas->width(); | 727 | const int widgetWidth = glCanvas->width(); |