Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -2992,6 +2992,13 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 2991 unmodified lines | |||
| 2992 | } | 2992 | } |
| 2993 | } | 2993 | } |
| 2994 | 2994 | ||
| 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 | |||
| 2995 | // restore default, white specular | 3002 | // restore default, white specular |
| 2996 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); | 3003 | glMaterialfv(GL_FRONT, GL_SPECULAR, WHITE_SPECULAR_COLOR); |
| 2997 | 3004 | ||
| @@ -3075,13 +3082,6 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) { · 77 unmodified lines | |||
| 3075 | renderWorldBox(); | 3082 | renderWorldBox(); |
| 3076 | } | 3083 | } |
| 3077 | 3084 | ||
| 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 | |||
| 3085 | // brad's frustum for debugging | 3085 | // brad's frustum for debugging |
| 3086 | if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayFrustum) && whichCamera.getMode() != CAMERA_MODE_MIRROR) { | 3086 | if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayFrustum) && whichCamera.getMode() != CAMERA_MODE_MIRROR) { |
| 3087 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 3087 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |