Showing the changes to interface/src/Application.cpp (1 of 24 files). Show all
Unified · Split
| @@ -2668,9 +2668,20 @@ void Application::updateShadowMap() { · 2667 unmodified lines | |||
| 2668 | glEnable(GL_POLYGON_OFFSET_FILL); | 2668 | glEnable(GL_POLYGON_OFFSET_FILL); |
| 2669 | glPolygonOffset(1.1f, 4.0f); // magic numbers courtesy http://www.eecs.berkeley.edu/~ravir/6160/papers/shadowmaps.ppt | 2669 | glPolygonOffset(1.1f, 4.0f); // magic numbers courtesy http://www.eecs.berkeley.edu/~ravir/6160/papers/shadowmaps.ppt |
| 2670 | 2670 | ||
| 2671 | _avatarManager.renderAvatars(Avatar::SHADOW_RENDER_MODE); | 2671 | { |
| 2672 | _particles.render(OctreeRenderer::SHADOW_RENDER_MODE); | 2672 | PerformanceTimer perfTimer("avatarManager"); |
| 2673 | _entities.render(OctreeRenderer::SHADOW_RENDER_MODE); | 2673 | _avatarManager.renderAvatars(Avatar::SHADOW_RENDER_MODE); |
| 2674 | } | ||
| 2675 | |||
| 2676 | { | ||
| 2677 | PerformanceTimer perfTimer("particles"); | ||
| 2678 | _particles.render(OctreeRenderer::SHADOW_RENDER_MODE); | ||
| 2679 | } | ||
| 2680 | |||
| 2681 | { | ||
| 2682 | PerformanceTimer perfTimer("entities"); | ||
| 2683 | _entities.render(OctreeRenderer::SHADOW_RENDER_MODE); | ||
| 2684 | } | ||
| 2674 | 2685 | ||
| 2675 | glDisable(GL_POLYGON_OFFSET_FILL); | 2686 | glDisable(GL_POLYGON_OFFSET_FILL); |
| 2676 | 2687 | ||
| @@ -2867,9 +2878,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 190 unmodified lines | |||
| 2867 | 2878 | ||
| 2868 | // render models... | 2879 | // render models... |
| 2869 | if (Menu::getInstance()->isOptionChecked(MenuOption::Models)) { | 2880 | if (Menu::getInstance()->isOptionChecked(MenuOption::Models)) { |
| 2870 | PerformanceTimer perfTimer("models"); | 2881 | PerformanceTimer perfTimer("entities"); |
| 2871 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 2882 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 2872 | "Application::displaySide() ... models..."); | 2883 | "Application::displaySide() ... entities..."); |
| 2873 | _entities.render(); | 2884 | _entities.render(); |
| 2874 | } | 2885 | } |
| 2875 | 2886 | ||