History

Merge pull request #3697 from ZappoMan/shadowsTo3DOverlays

Shadows to3 d overlays

Stephen Birarda committed 12 years ago

Commit 45763a92 parents 12c79b2 ac115084 files · +22 −16Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+12−6
@@ -2790,6 +2790,12 @@ void Application::updateShadowMap() { · 2789 unmodified lines
27902790 _entities.render(RenderArgs::SHADOW_RENDER_MODE);
27912791 }
27922792
2793+ // render JS/scriptable overlays
2794+ {
2795+ PerformanceTimer perfTimer("3dOverlays");
2796+ _overlays.render3D(RenderArgs::SHADOW_RENDER_MODE);
2797+ }
2798+
27932799 glDisable(GL_POLYGON_OFFSET_FILL);
27942800
27952801 glPopMatrix();
@@ -2986,6 +2992,12 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 190 unmodified lines
29862992 _entities.render();
29872993 }
29882994
2995+ // render JS/scriptable overlays
2996+ {
2997+ PerformanceTimer perfTimer("3dOverlays");
2998+ _overlays.render3D();
2999+ }
3000+
29893001 // render the ambient occlusion effect if enabled
29903002 if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
29913003 PerformanceTimer perfTimer("ambientOcclusion");
@@ -3059,12 +3071,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 67 unmodified lines
30593071 PerformanceTimer perfTimer("inWorldInterface");
30603072 emit renderingInWorldInterface();
30613073 }
3062−
3063− // render JS/scriptable overlays
3064− {
3065− PerformanceTimer perfTimer("3dOverlays");
3066− _overlays.render3D();
3067− }
30683074 }
30693075
30703076 if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t