Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -1029,7 +1029,7 @@ void Application::showEditEntitiesHelp() { · 1028 unmodified lines | |||
| 1029 | InfoView::show(INFO_EDIT_ENTITIES_PATH); | 1029 | InfoView::show(INFO_EDIT_ENTITIES_PATH); |
| 1030 | } | 1030 | } |
| 1031 | 1031 | ||
| 1032 | void Application::resetCamerasOnResizeGL(Camera& camera, const glm::uvec2& size) { | 1032 | void Application::resetCameras(Camera& camera, const glm::uvec2& size) { |
| 1033 | if (OculusManager::isConnected()) { | 1033 | if (OculusManager::isConnected()) { |
| 1034 | OculusManager::configureCamera(camera); | 1034 | OculusManager::configureCamera(camera); |
| 1035 | } else if (TV3DManager::isConnected()) { | 1035 | } else if (TV3DManager::isConnected()) { |
| @@ -1052,7 +1052,6 @@ void Application::resizeGL() { · 16 unmodified lines | |||
| 1052 | if (_renderResolution != toGlm(renderSize)) { | 1052 | if (_renderResolution != toGlm(renderSize)) { |
| 1053 | _renderResolution = toGlm(renderSize); | 1053 | _renderResolution = toGlm(renderSize); |
| 1054 | DependencyManager::get<TextureCache>()->setFrameBufferSize(renderSize); | 1054 | DependencyManager::get<TextureCache>()->setFrameBufferSize(renderSize); |
| 1055 | resetCamerasOnResizeGL(_myCamera, _renderResolution); | ||
| 1056 | 1055 | ||
| 1057 | glViewport(0, 0, _renderResolution.x, _renderResolution.y); // shouldn't this account for the menu??? | 1056 | glViewport(0, 0, _renderResolution.x, _renderResolution.y); // shouldn't this account for the menu??? |
| 1058 | 1057 | ||
| @@ -1060,6 +1059,8 @@ void Application::resizeGL() { · 1 unmodified line | |||
| 1060 | glLoadIdentity(); | 1059 | glLoadIdentity(); |
| 1061 | } | 1060 | } |
| 1062 | 1061 | ||
| 1062 | resetCameras(_myCamera, _renderResolution); | ||
| 1063 | |||
| 1063 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 1064 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| 1064 | 1065 | ||
| 1065 | auto canvasSize = _glWidget->size(); | 1066 | auto canvasSize = _glWidget->size(); |