History

Add calls to Overlays::render3DFront()

Ryan Huffman committed 11 years ago

Commit 8b982871 parent 0b46e351 file · +12 −0Browse files

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

Unified · Split

interface/src/Application.cpp+12−0
@@ -2839,6 +2839,11 @@ void Application::updateShadowMap() { · 2838 unmodified lines
2839 _overlays.render3D(RenderArgs::SHADOW_RENDER_MODE);2839 _overlays.render3D(RenderArgs::SHADOW_RENDER_MODE);
2840 }2840 }
2841 2841
2842 {
2843 PerformanceTimer perfTimer("3dOverlaysFront");
2844 _overlays.render3DFront(RenderArgs::SHADOW_RENDER_MODE);
2845 }
2846
2842 glDisable(GL_POLYGON_OFFSET_FILL);2847 glDisable(GL_POLYGON_OFFSET_FILL);
2843 2848
2844 glPopMatrix();2849 glPopMatrix();
@@ -3135,6 +3140,13 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly, RenderAr · 290 unmodified lines
3135 if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {3140 if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) {
3136 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);3141 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
3137 }3142 }
3143
3144 // Render 3D overlays that should be drawn in front
3145 {
3146 PerformanceTimer perfTimer("3dOverlaysFront");
3147 glClear(GL_DEPTH_BUFFER_BIT);
3148 _overlays.render3DFront();
3149 }
3138}3150}
3139 3151
3140void Application::updateUntranslatedViewMatrix(const glm::vec3& viewMatrixTranslation) {3152void Application::updateUntranslatedViewMatrix(const glm::vec3& viewMatrixTranslation) {

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