Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all
Unified · Split
| @@ -3037,17 +3037,6 @@ void Application::updateShadowMap(RenderArgs* renderArgs) { · 3036 unmodified lines | ||
| 3037 | 3037 | _entities.render(renderArgs); |
| 3038 | 3038 | } |
| 3039 | 3039 | |
| 3040 | − // render JS/scriptable overlays | |
| 3041 | − { | |
| 3042 | − PerformanceTimer perfTimer("3dOverlays"); | |
| 3043 | − _overlays.renderWorld(renderArgs, false); | |
| 3044 | − } | |
| 3045 | − | |
| 3046 | − { | |
| 3047 | − PerformanceTimer perfTimer("3dOverlaysFront"); | |
| 3048 | − _overlays.renderWorld(renderArgs, true); | |
| 3049 | − } | |
| 3050 | − | |
| 3051 | 3040 | glDisable(GL_POLYGON_OFFSET_FILL); |
| 3052 | 3041 | |
| 3053 | 3042 | glPopMatrix(); |
| @@ -3366,12 +3355,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 312 unmodified lines | ||
| 3366 | 3355 | DependencyManager::get<DeferredLightingEffect>()->prepare(); |
| 3367 | 3356 | |
| 3368 | 3357 | if (!selfAvatarOnly) { |
| 3369 | − | |
| 3370 | − // render JS/scriptable overlays | |
| 3371 | − { | |
| 3372 | − PerformanceTimer perfTimer("3dOverlays"); | |
| 3373 | − _overlays.renderWorld(renderArgs, false); | |
| 3374 | − } | |
| 3375 | 3358 | |
| 3376 | 3359 | // render models... |
| 3377 | 3360 | if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) { |
| @@ -3489,13 +3472,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 111 unmodified lines | ||
| 3489 | 3472 | glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); |
| 3490 | 3473 | } |
| 3491 | 3474 | |
| 3492 | − // Render 3D overlays that should be drawn in front | |
| 3493 | − { | |
| 3494 | − PerformanceTimer perfTimer("3dOverlaysFront"); | |
| 3495 | − glClear(GL_DEPTH_BUFFER_BIT); | |
| 3496 | − Glower glower(renderArgs); // Sets alpha to 1.0 | |
| 3497 | − _overlays.renderWorld(renderArgs, true); | |
| 3498 | − } | |
| 3499 | 3475 | activeRenderingThread = nullptr; |
| 3500 | 3476 | } |
| 3501 | 3477 | |