From 7ae97522723766e51a5aae200ec670380d8a048b Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 23 Feb 2016 16:15:27 -0800 Subject: [PATCH] Remove Render > Ambient Light menu --- interface/src/Application.cpp | 32 ++------------------------------ interface/src/Application.h | 1 - interface/src/Menu.cpp | 16 ---------------- interface/src/Menu.h | 12 ------------ 4 files changed, 2 insertions(+), 59 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 89ec196fad..1ff448f35f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3817,9 +3817,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se } // Setup the current Zone Entity lighting and skybox - // Fixme: We need a better soution through an actual render item !!! { - DependencyManager::get()->setAmbientLightMode(getRenderAmbientLight()); + // FIXME: Use a zone setting to determine the ambient light mode + DependencyManager::get()->setAmbientLightMode(-1); auto skyStage = DependencyManager::get()->getSkyStage(); DependencyManager::get()->setGlobalLight(skyStage->getSunLight()->getDirection(), skyStage->getSunLight()->getColor(), skyStage->getSunLight()->getIntensity(), skyStage->getSunLight()->getAmbientIntensity()); @@ -4630,34 +4630,6 @@ float Application::getRenderResolutionScale() const { } } -int Application::getRenderAmbientLight() const { - if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLightGlobal)) { - return -1; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight0)) { - return 0; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight1)) { - return 1; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight2)) { - return 2; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight3)) { - return 3; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight4)) { - return 4; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight5)) { - return 5; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight6)) { - return 6; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight7)) { - return 7; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight8)) { - return 8; - } else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight9)) { - return 9; - } else { - return -1; - } -} - void Application::notifyPacketVersionMismatch() { if (!_notifiedPacketVersionMismatchThisDomain) { _notifiedPacketVersionMismatchThisDomain = true; diff --git a/interface/src/Application.h b/interface/src/Application.h index 8cc2a33038..51b90bcb99 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -352,7 +352,6 @@ private: void checkSkeleton(); void initializeAcceptedFiles(); - int getRenderAmbientLight() const; void displaySide(RenderArgs* renderArgs, Camera& whichCamera, bool selfAvatarOnly = false); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 97eb67116c..9c7788851c 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -350,22 +350,6 @@ Menu::Menu() { addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes); addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true); - // Developer > Render > Ambient Light - MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight); - QActionGroup* ambientLightGroup = new QActionGroup(ambientLightMenu); - ambientLightGroup->setExclusive(true); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLightGlobal, 0, true)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight0, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight1, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight2, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight3, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight4, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight5, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight6, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight7, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight8, 0, false)); - ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight9, 0, false)); - // Developer > Render > Throttle FPS If Not Focus addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, true); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 51a1542490..44a24ee895 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -266,18 +266,6 @@ namespace MenuOption { const QString RenderResolutionHalf = "1/2"; const QString RenderResolutionThird = "1/3"; const QString RenderResolutionQuarter = "1/4"; - const QString RenderAmbientLight = "Ambient Light"; - const QString RenderAmbientLightGlobal = "Global"; - const QString RenderAmbientLight0 = "OLD_TOWN_SQUARE"; - const QString RenderAmbientLight1 = "GRACE_CATHEDRAL"; - const QString RenderAmbientLight2 = "EUCALYPTUS_GROVE"; - const QString RenderAmbientLight3 = "ST_PETERS_BASILICA"; - const QString RenderAmbientLight4 = "UFFIZI_GALLERY"; - const QString RenderAmbientLight5 = "GALILEOS_TOMB"; - const QString RenderAmbientLight6 = "VINE_STREET_KITCHEN"; - const QString RenderAmbientLight7 = "BREEZEWAY"; - const QString RenderAmbientLight8 = "CAMPUS_SUNSET"; - const QString RenderAmbientLight9 = "FUNSTON_BEACH_SUNSET"; const QString ResetAvatarSize = "Reset Avatar Size"; const QString ResetSensors = "Reset Sensors"; const QString RunningScripts = "Running Scripts...";