Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all
Unified · Split
| @@ -821,6 +821,11 @@ void Application::paintGL() { · 820 unmodified lines | |||
| 821 | resizeGL(); | 821 | resizeGL(); |
| 822 | Q_ASSERT(_offscreenContext->getContext() == QOpenGLContext::currentContext()); | 822 | Q_ASSERT(_offscreenContext->getContext() == QOpenGLContext::currentContext()); |
| 823 | 823 | ||
| 824 | { | ||
| 825 | PerformanceTimer perfTimer("renderOverlay"); | ||
| 826 | _applicationOverlay.renderOverlay(); | ||
| 827 | } | ||
| 828 | |||
| 824 | glEnable(GL_LINE_SMOOTH); | 829 | glEnable(GL_LINE_SMOOTH); |
| 825 | 830 | ||
| 826 | if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) { | 831 | if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) { |
| @@ -892,10 +897,6 @@ void Application::paintGL() { · 65 unmodified lines | |||
| 892 | } | 897 | } |
| 893 | 898 | ||
| 894 | finalFbo = DependencyManager::get<GlowEffect>()->render(); | 899 | finalFbo = DependencyManager::get<GlowEffect>()->render(); |
| 895 | { | ||
| 896 | PerformanceTimer perfTimer("renderOverlay"); | ||
| 897 | _applicationOverlay.renderOverlay(); | ||
| 898 | } | ||
| 899 | } | 900 | } |
| 900 | 901 | ||
| 901 | // This might not be needed *right now*. We want to ensure that the FBO rendering | 902 | // This might not be needed *right now*. We want to ensure that the FBO rendering |
| @@ -4681,4 +4682,4 @@ void Application::shutdownPlugins() { · 3779 unmodified lines | |||
| 4681 | 4682 | ||
| 4682 | glm::ivec2 Application::getMouse() const { | 4683 | glm::ivec2 Application::getMouse() const { |
| 4683 | return getActiveDisplayPlugin()->getUiMousePosition(); | 4684 | return getActiveDisplayPlugin()->getUiMousePosition(); |
| 4684 | } | 4685 | } |