Showing the changes to interface/src/Menu.cpp (1 of 272 files). Show all
Unified · Split
| @@ -45,6 +45,9 @@ · 44 unmodified lines | ||
| 45 | 45 | #include "LocationBookmarks.h" |
| 46 | 46 | #include "DeferredLightingEffect.h" |
| 47 | 47 | |
| 48 | +#include "AmbientOcclusionEffect.h" | |
| 49 | +#include "RenderShadowTask.h" | |
| 50 | + | |
| 48 | 51 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| 49 | 52 | #include "SpeechRecognizer.h" |
| 50 | 53 | #endif |
| @@ -361,18 +364,6 @@ Menu::Menu() { · 310 unmodified lines | ||
| 361 | 364 | // Developer menu ---------------------------------- |
| 362 | 365 | MenuWrapper* developerMenu = addMenu("Developer", "Developer"); |
| 363 | 366 | |
| 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()); | |
| 374 | − }); | |
| 375 | − | |
| 376 | 367 | // Developer > UI >>> |
| 377 | 368 | MenuWrapper* uiOptionsMenu = developerMenu->addMenu("UI"); |
| 378 | 369 | action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::DesktopTabletToToolbar, 0, |
| @@ -389,6 +380,36 @@ Menu::Menu() { · 10 unmodified lines | ||
| 389 | 380 | |
| 390 | 381 | // Developer > Render >>> |
| 391 | 382 | MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render"); |
| 383 | + action = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Shadows, 0, true); | |
| 384 | + connect(action, &QAction::triggered, [action] { | |
| 385 | + auto renderConfig = qApp->getRenderEngine()->getConfiguration(); | |
| 386 | + if (renderConfig) { | |
| 387 | + auto mainViewShadowTaskConfig = renderConfig->getConfig<RenderShadowTask>("RenderMainView.RenderShadowTask"); | |
| 388 | + if (mainViewShadowTaskConfig) { | |
| 389 | + if (action->isChecked()) { | |
| 390 | + mainViewShadowTaskConfig->setPreset("Enabled"); | |
| 391 | + } else { | |
| 392 | + mainViewShadowTaskConfig->setPreset("None"); | |
| 393 | + } | |
| 394 | + } | |
| 395 | + } | |
| 396 | + }); | |
| 397 | + | |
| 398 | + action = addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::AmbientOcclusion, 0, false); | |
| 399 | + connect(action, &QAction::triggered, [action] { | |
| 400 | + auto renderConfig = qApp->getRenderEngine()->getConfiguration(); | |
| 401 | + if (renderConfig) { | |
| 402 | + auto mainViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("RenderMainView.AmbientOcclusion"); | |
| 403 | + if (mainViewAmbientOcclusionConfig) { | |
| 404 | + if (action->isChecked()) { | |
| 405 | + mainViewAmbientOcclusionConfig->setPreset("Enabled"); | |
| 406 | + } else { | |
| 407 | + mainViewAmbientOcclusionConfig->setPreset("None"); | |
| 408 | + } | |
| 409 | + } | |
| 410 | + } | |
| 411 | + }); | |
| 412 | + | |
| 392 | 413 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes); |
| 393 | 414 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DefaultSkybox, 0, true); |
| 394 | 415 | |