History

Re-implemented shadow controls.

NissimHadar committed 8 years ago

Commit 0f2cf8e1 parent d888e7f30 files · +269 −95Browse files

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

Unified · Split

interface/src/Menu.cpp+11−5
@@ -43,6 +43,7 @@ · 42 unmodified lines
4343 #include "ui/StandAloneJSConsole.h"
4444 #include "InterfaceLogging.h"
4545 #include "LocationBookmarks.h"
46+#include "DeferredLightingEffect.h"
4647
4748 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
4849 #include "SpeechRecognizer.h"
@@ -360,11 +361,16 @@ Menu::Menu() { · 311 unmodified lines
360361 // Developer menu ----------------------------------
361362 MenuWrapper* developerMenu = addMenu("Developer", "Developer");
362363
363− // Developer > Graphics...
364− action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
365− connect(action, &QAction::triggered, [] {
366− qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
367− QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
364+ // Developer > Graphics
365+ MenuWrapper* graphicsOptionsMenu = developerMenu->addMenu("Render");
366+ action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::Shadows, 0, true);
367+ connect(action, &QAction::triggered, [action] {
368+ DependencyManager::get<DeferredLightingEffect>()->setShadowMapEnabled(action->isChecked());
369+ });
370+
371+ action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::AmbientOcclusion, 0, false);
372+ connect(action, &QAction::triggered, [action] {
373+ DependencyManager::get<DeferredLightingEffect>()->setAmbientOcclusionEnabled(action->isChecked());
368374 });
369375
370376 // Developer > UI >>>