From dec4a4c4222bc9d26ec67a60604494ab9fa1f9f9 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Mon, 19 Aug 2013 11:45:43 -0700 Subject: [PATCH] Added toggle for ambient occlusion (defaults to off). --- interface/src/Application.cpp | 5 ++++- interface/src/Menu.cpp | 1 + interface/src/Menu.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index dc7fd14d49..47248ecaeb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2378,7 +2378,10 @@ void Application::displaySide(Camera& whichCamera) { renderWorldBox(); } - _ambientOcclusionEffect.render(); + // render the ambient occlusion effect if enabled + if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) { + _ambientOcclusionEffect.render(); + } // brad's frustum for debugging if (Menu::getInstance()->isOptionChecked(MenuOption::DisplayFrustum)) { diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 56317b86a2..d49d322f34 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -157,6 +157,7 @@ Menu::Menu() : appInstance->getGlowEffect(), SLOT(cycleRenderMode())); + addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::AmbientOcclusion); addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::FrameTimer); addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtVectors); addCheckableActionToQMenuAndActionHash(renderMenu, MenuOption::LookAtIndicator, 0, true); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 2d871fd890..e7ecbcaf79 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -107,6 +107,7 @@ private: namespace MenuOption { + const QString AmbientOcclusion = "Ambient Occlusion"; const QString Avatars = "Avatars"; const QString AvatarAsBalls = "Avatar as Balls"; const QString Atmosphere = "Atmosphere";