History

split out entity rendering into subclasses, improved rendering of models

ZappoMan committed 12 years ago

Commit ef86d861 parent ddae85c24 files · +886 −466Browse files

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

Unified · Split

interface/src/Application.cpp+16−5
@@ -2668,9 +2668,20 @@ void Application::updateShadowMap() { · 2667 unmodified lines
26682668 glEnable(GL_POLYGON_OFFSET_FILL);
26692669 glPolygonOffset(1.1f, 4.0f); // magic numbers courtesy http://www.eecs.berkeley.edu/~ravir/6160/papers/shadowmaps.ppt
26702670
2671− _avatarManager.renderAvatars(Avatar::SHADOW_RENDER_MODE);
2672− _particles.render(OctreeRenderer::SHADOW_RENDER_MODE);
2673− _entities.render(OctreeRenderer::SHADOW_RENDER_MODE);
2671+ {
2672+ PerformanceTimer perfTimer("avatarManager");
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+ }
26742685
26752686 glDisable(GL_POLYGON_OFFSET_FILL);
26762687
@@ -2867,9 +2878,9 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 190 unmodified lines
28672878
28682879 // render models...
28692880 if (Menu::getInstance()->isOptionChecked(MenuOption::Models)) {
2870− PerformanceTimer perfTimer("models");
2881+ PerformanceTimer perfTimer("entities");
28712882 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2872− "Application::displaySide() ... models...");
2883+ "Application::displaySide() ... entities...");
28732884 _entities.render();
28742885 }
28752886

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