History

Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"

This reverts commit 3201d2ba21f8b0e131bf362a7cbb6142db09e329, reversing changes made to c0f20900a055c457b3c240f2fe2e81eabb7066af.

SamGondelman committed 8 years ago

Commit 0fca56e1 parent abe7c2937 files · +147 −285Browse files

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

Unified · Split

interface/src/Menu.cpp+4−10
@@ -43,7 +43,6 @@ · 42 unmodified lines
43#include "ui/StandAloneJSConsole.h"43#include "ui/StandAloneJSConsole.h"
44#include "InterfaceLogging.h"44#include "InterfaceLogging.h"
45#include "LocationBookmarks.h"45#include "LocationBookmarks.h"
46#include "DeferredLightingEffect.h"
47 46
48#if defined(Q_OS_MAC) || defined(Q_OS_WIN)47#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
49#include "SpeechRecognizer.h"48#include "SpeechRecognizer.h"
@@ -362,15 +361,10 @@ Menu::Menu() { · 312 unmodified lines
362 MenuWrapper* developerMenu = addMenu("Developer", "Developer");361 MenuWrapper* developerMenu = addMenu("Developer", "Developer");
363 362
364 // Developer > Graphics...363 // Developer > Graphics...
365 MenuWrapper* graphicsOptionsMenu = developerMenu->addMenu("Render");364 action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
366 action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::Shadows, 0, true);365 connect(action, &QAction::triggered, [] {
367 connect(action, &QAction::triggered, [action] {366 qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
368 DependencyManager::get<DeferredLightingEffect>()->setShadowMapEnabled(action->isChecked());367 QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
369 });
370
371 action = addCheckableActionToQMenuAndActionHash(graphicsOptionsMenu, MenuOption::AmbientOcclusion, 0, false);
372 connect(action, &QAction::triggered, [action] {
373 DependencyManager::get<DeferredLightingEffect>()->setAmbientOcclusionEnabled(action->isChecked());
374 });368 });
375 369
376 // Developer > UI >>>370 // Developer > UI >>>