Showing the changes to interface/src/Application.cpp (1 of 17 files). Show all
Unified · Split
| @@ -90,6 +90,8 @@ · 89 unmodified lines | |||
| 90 | #include "gpu/Batch.h" | 90 | #include "gpu/Batch.h" |
| 91 | #include "gpu/GLBackend.h" | 91 | #include "gpu/GLBackend.h" |
| 92 | 92 | ||
| 93 | #include "renderer/GlowEffect.h" | ||
| 94 | |||
| 93 | #include "scripting/AccountScriptingInterface.h" | 95 | #include "scripting/AccountScriptingInterface.h" |
| 94 | #include "scripting/AudioDeviceScriptingInterface.h" | 96 | #include "scripting/AudioDeviceScriptingInterface.h" |
| 95 | #include "scripting/ClipboardScriptingInterface.h" | 97 | #include "scripting/ClipboardScriptingInterface.h" |
| @@ -702,7 +704,7 @@ void Application::paintGL() { · 606 unmodified lines | |||
| 702 | TV3DManager::display(*whichCamera); | 704 | TV3DManager::display(*whichCamera); |
| 703 | 705 | ||
| 704 | } else { | 706 | } else { |
| 705 | _glowEffect.prepare(); | 707 | DependencyManager::get<GlowEffect>()->prepare(); |
| 706 | 708 | ||
| 707 | // Viewport is assigned to the size of the framebuffer | 709 | // Viewport is assigned to the size of the framebuffer |
| 708 | QSize size = DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->size(); | 710 | QSize size = DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->size(); |
| @@ -721,7 +723,7 @@ void Application::paintGL() { · 12 unmodified lines | |||
| 721 | renderRearViewMirror(_mirrorViewRect); | 723 | renderRearViewMirror(_mirrorViewRect); |
| 722 | } | 724 | } |
| 723 | 725 | ||
| 724 | _glowEffect.render(); | 726 | DependencyManager::get<GlowEffect>()->render(); |
| 725 | 727 | ||
| 726 | { | 728 | { |
| 727 | PerformanceTimer perfTimer("renderOverlay"); | 729 | PerformanceTimer perfTimer("renderOverlay"); |
| @@ -1913,7 +1915,6 @@ void Application::init() { · 1185 unmodified lines | |||
| 1913 | _environment.init(); | 1915 | _environment.init(); |
| 1914 | 1916 | ||
| 1915 | _deferredLightingEffect.init(); | 1917 | _deferredLightingEffect.init(); |
| 1916 | _glowEffect.init(); | ||
| 1917 | _ambientOcclusionEffect.init(); | 1918 | _ambientOcclusionEffect.init(); |
| 1918 | 1919 | ||
| 1919 | // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager | 1920 | // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager |
| @@ -2036,6 +2037,9 @@ void Application::init() { · 116 unmodified lines | |||
| 2036 | 2037 | ||
| 2037 | // make sure our texture cache knows about window size changes | 2038 | // make sure our texture cache knows about window size changes |
| 2038 | DependencyManager::get<TextureCache>()->associateWithWidget(getGLWidget()); | 2039 | DependencyManager::get<TextureCache>()->associateWithWidget(getGLWidget()); |
| 2040 | |||
| 2041 | // initialize the GlowEffect with our widget | ||
| 2042 | DependencyManager::get<GlowEffect>()->init(getGLWidget()); | ||
| 2039 | } | 2043 | } |
| 2040 | 2044 | ||
| 2041 | void Application::closeMirrorView() { | 2045 | void Application::closeMirrorView() { |