History

Don't apply ambient occlusion to avatars (just voxels).

Andrzej Kapolka committed 12 years ago

Commit 85f79951 parent 2cf4c3f1 file · +7 −7Browse files

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

Unified · Split

interface/src/Application.cpp+7−7
@@ -2992,6 +2992,13 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2991 unmodified lines
29922992 }
29932993 }
29942994
2995+ // render the ambient occlusion effect if enabled
2996+ if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
2997+ PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
2998+ "Application::displaySide() ... AmbientOcclusion...");
2999+ _ambientOcclusionEffect.render();
3000+ }
3001+
29953002 // restore default, white specular
29963003 glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR);
29973004
@@ -3075,13 +3082,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 77 unmodified lines
30753082 renderWorldBox();
30763083 }
30773084
3078− // render the ambient occlusion effect if enabled
3079− if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) {
3080− PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
3081− "Application::displaySide() ... AmbientOcclusion...");
3082− _ambientOcclusionEffect.render();
3083− }
3084−
30853085 // brad's frustum for debugging
30863086 if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayFrustum) && whichCamera.getMode() != CAMERA_MODE_MIRROR) {
30873087 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),

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