Showing the changes to interface/src/Application.cpp (1 of 44 files). Show all
Unified · Split
| @@ -910,7 +910,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 909 unmodified lines | |||
| 910 | break; | 910 | break; |
| 911 | 911 | ||
| 912 | case Qt::Key_D: | 912 | case Qt::Key_D: |
| 913 | _myAvatar->setDriveKeys(ROT_RIGHT, 1.f); | 913 | if (!isMeta) { |
| 914 | _myAvatar->setDriveKeys(ROT_RIGHT, 1.f); | ||
| 915 | } | ||
| 914 | break; | 916 | break; |
| 915 | 917 | ||
| 916 | case Qt::Key_Return: | 918 | case Qt::Key_Return: |
| @@ -1079,7 +1081,7 @@ void Application::keyReleaseEvent(QKeyEvent* event) { · 162 unmodified lines | |||
| 1079 | _keysPressed.remove(event->key()); | 1081 | _keysPressed.remove(event->key()); |
| 1080 | 1082 | ||
| 1081 | _controllerScriptingInterface.emitKeyReleaseEvent(event); // send events to any registered scripts | 1083 | _controllerScriptingInterface.emitKeyReleaseEvent(event); // send events to any registered scripts |
| 1082 | 1084 | ||
| 1083 | // if one of our scripts have asked to capture this event, then stop processing it | 1085 | // if one of our scripts have asked to capture this event, then stop processing it |
| 1084 | if (_controllerScriptingInterface.isKeyCaptured(event)) { | 1086 | if (_controllerScriptingInterface.isKeyCaptured(event)) { |
| 1085 | return; | 1087 | return; |
| @@ -1131,7 +1133,12 @@ void Application::keyReleaseEvent(QKeyEvent* event) { · 45 unmodified lines | |||
| 1131 | _myAvatar->setDriveKeys(RIGHT, 0.f); | 1133 | _myAvatar->setDriveKeys(RIGHT, 0.f); |
| 1132 | _myAvatar->setDriveKeys(ROT_RIGHT, 0.f); | 1134 | _myAvatar->setDriveKeys(ROT_RIGHT, 0.f); |
| 1133 | break; | 1135 | break; |
| 1134 | 1136 | case Qt::Key_Control: | |
| 1137 | case Qt::Key_Shift: | ||
| 1138 | case Qt::Key_Meta: | ||
| 1139 | case Qt::Key_Alt: | ||
| 1140 | _myAvatar->clearDriveKeys(); | ||
| 1141 | break; | ||
| 1135 | default: | 1142 | default: |
| 1136 | event->ignore(); | 1143 | event->ignore(); |
| 1137 | break; | 1144 | break; |
| @@ -2730,6 +2737,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 1592 unmodified lines | |||
| 2730 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()"); | 2737 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "Application::displaySide()"); |
| 2731 | // transform by eye offset | 2738 | // transform by eye offset |
| 2732 | 2739 | ||
| 2740 | // load the view frustum | ||
| 2741 | loadViewFrustum(whichCamera, _displayViewFrustum); | ||
| 2742 | |||
| 2733 | // flip x if in mirror mode (also requires reversing winding order for backface culling) | 2743 | // flip x if in mirror mode (also requires reversing winding order for backface culling) |
| 2734 | if (whichCamera.getMode() == CAMERA_MODE_MIRROR) { | 2744 | if (whichCamera.getMode() == CAMERA_MODE_MIRROR) { |
| 2735 | glScalef(-1.0f, 1.0f, 1.0f); | 2745 | glScalef(-1.0f, 1.0f, 1.0f); |
| @@ -2977,7 +2987,14 @@ void Application::getProjectionMatrix(glm::dmat4* projectionMatrix) { · 241 unmodified lines | |||
| 2977 | void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, | 2987 | void Application::computeOffAxisFrustum(float& left, float& right, float& bottom, float& top, float& nearVal, |
| 2978 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { | 2988 | float& farVal, glm::vec4& nearClipPlane, glm::vec4& farClipPlane) const { |
| 2979 | 2989 | ||
| 2990 | // allow 3DTV/Oculus to override parameters from camera | ||
| 2980 | _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | 2991 | _viewFrustum.computeOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); |
| 2992 | if (OculusManager::isConnected()) { | ||
| 2993 | OculusManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | ||
| 2994 | |||
| 2995 | } else if (TV3DManager::isConnected()) { | ||
| 2996 | TV3DManager::overrideOffAxisFrustum(left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); | ||
| 2997 | } | ||
| 2981 | } | 2998 | } |
| 2982 | 2999 | ||
| 2983 | glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { | 3000 | glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) { |