Shadows to3 d overlays
Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -2790,6 +2790,12 @@ void Application::updateShadowMap() { · 2789 unmodified lines | |||
| 2790 | _entities.render(RenderArgs::SHADOW_RENDER_MODE); | 2790 | _entities.render(RenderArgs::SHADOW_RENDER_MODE); |
| 2791 | } | 2791 | } |
| 2792 | 2792 | ||
| 2793 | // render JS/scriptable overlays | ||
| 2794 | { | ||
| 2795 | PerformanceTimer perfTimer("3dOverlays"); | ||
| 2796 | _overlays.render3D(RenderArgs::SHADOW_RENDER_MODE); | ||
| 2797 | } | ||
| 2798 | |||
| 2793 | glDisable(GL_POLYGON_OFFSET_FILL); | 2799 | glDisable(GL_POLYGON_OFFSET_FILL); |
| 2794 | 2800 | ||
| 2795 | glPopMatrix(); | 2801 | glPopMatrix(); |
| @@ -2986,6 +2992,12 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 190 unmodified lines | |||
| 2986 | _entities.render(); | 2992 | _entities.render(); |
| 2987 | } | 2993 | } |
| 2988 | 2994 | ||
| 2995 | // render JS/scriptable overlays | ||
| 2996 | { | ||
| 2997 | PerformanceTimer perfTimer("3dOverlays"); | ||
| 2998 | _overlays.render3D(); | ||
| 2999 | } | ||
| 3000 | |||
| 2989 | // render the ambient occlusion effect if enabled | 3001 | // render the ambient occlusion effect if enabled |
| 2990 | if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) { | 3002 | if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) { |
| 2991 | PerformanceTimer perfTimer("ambientOcclusion"); | 3003 | PerformanceTimer perfTimer("ambientOcclusion"); |
| @@ -3059,12 +3071,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 67 unmodified lines | |||
| 3059 | PerformanceTimer perfTimer("inWorldInterface"); | 3071 | PerformanceTimer perfTimer("inWorldInterface"); |
| 3060 | emit renderingInWorldInterface(); | 3072 | emit renderingInWorldInterface(); |
| 3061 | } | 3073 | } |
| 3062 | |||
| 3063 | // render JS/scriptable overlays | ||
| 3064 | { | ||
| 3065 | PerformanceTimer perfTimer("3dOverlays"); | ||
| 3066 | _overlays.render3D(); | ||
| 3067 | } | ||
| 3068 | } | 3074 | } |
| 3069 | 3075 | ||
| 3070 | if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) { | 3076 | if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) { |