History

Rename 2D -> HUD, 3D -> World in Overlays

Ryan Huffman committed 11 years ago

Commit 2b835e61 parent 468c5648 files · +86 −88Browse files

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

Unified · Split

interface/src/Application.cpp+4−4
@@ -2896,12 +2896,12 @@ void Application::updateShadowMap() { · 2895 unmodified lines
2896 // render JS/scriptable overlays2896 // render JS/scriptable overlays
2897 {2897 {
2898 PerformanceTimer perfTimer("3dOverlays");2898 PerformanceTimer perfTimer("3dOverlays");
2899 _overlays.render3D(false, RenderArgs::SHADOW_RENDER_MODE);2899 _overlays.renderWorld(false, RenderArgs::SHADOW_RENDER_MODE);
2900 }2900 }
2901 2901
2902 {2902 {
2903 PerformanceTimer perfTimer("3dOverlaysFront");2903 PerformanceTimer perfTimer("3dOverlaysFront");
2904 _overlays.render3D(true, RenderArgs::SHADOW_RENDER_MODE);2904 _overlays.renderWorld(true, RenderArgs::SHADOW_RENDER_MODE);
2905 }2905 }
2906 2906
2907 glDisable(GL_POLYGON_OFFSET_FILL);2907 glDisable(GL_POLYGON_OFFSET_FILL);
@@ -3129,7 +3129,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 221 unmodified lines
3129 // render JS/scriptable overlays3129 // render JS/scriptable overlays
3130 {3130 {
3131 PerformanceTimer perfTimer("3dOverlays");3131 PerformanceTimer perfTimer("3dOverlays");
3132 _overlays.render3D(false);3132 _overlays.renderWorld(false);
3133 }3133 }
3134 3134
3135 // render the ambient occlusion effect if enabled3135 // render the ambient occlusion effect if enabled
@@ -3218,7 +3218,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 82 unmodified lines
3218 {3218 {
3219 PerformanceTimer perfTimer("3dOverlaysFront");3219 PerformanceTimer perfTimer("3dOverlaysFront");
3220 glClear(GL_DEPTH_BUFFER_BIT);3220 glClear(GL_DEPTH_BUFFER_BIT);
3221 _overlays.render3D(true);3221 _overlays.renderWorld(true);
3222 }3222 }
3223}3223}
3224 3224

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