Showing the changes to interface/src/Menu.cpp (1 of 18 files). Show all
Unified · Split
| @@ -48,6 +48,7 @@ · 47 unmodified lines | |||
| 48 | #include "DeferredLightingEffect.h" | 48 | #include "DeferredLightingEffect.h" |
| 49 | #include "PickManager.h" | 49 | #include "PickManager.h" |
| 50 | 50 | ||
| 51 | #include "LightingModel.h" | ||
| 51 | #include "AmbientOcclusionEffect.h" | 52 | #include "AmbientOcclusionEffect.h" |
| 52 | #include "RenderShadowTask.h" | 53 | #include "RenderShadowTask.h" |
| 53 | #include "AntialiasingEffect.h" | 54 | #include "AntialiasingEffect.h" |
| @@ -393,14 +394,19 @@ Menu::Menu() { · 339 unmodified lines | |||
| 393 | connect(action, &QAction::triggered, [action] { | 394 | connect(action, &QAction::triggered, [action] { |
| 394 | auto renderConfig = qApp->getRenderEngine()->getConfiguration(); | 395 | auto renderConfig = qApp->getRenderEngine()->getConfiguration(); |
| 395 | if (renderConfig) { | 396 | if (renderConfig) { |
| 396 | auto mainViewShadowTaskConfig = renderConfig->getConfig<RenderShadowTask>("RenderMainView.RenderShadowTask"); | 397 | auto lightingModelConfig = renderConfig->getConfig<MakeLightingModel>("RenderMainView.LightingModel"); |
| 398 | if (lightingModelConfig) { | ||
| 399 | lightingModelConfig->setShadow(action->isChecked()); | ||
| 400 | } | ||
| 401 | |||
| 402 | /* auto mainViewShadowTaskConfig = renderConfig->getConfig<RenderShadowTask>("RenderMainView.RenderShadowTask"); | ||
| 397 | if (mainViewShadowTaskConfig) { | 403 | if (mainViewShadowTaskConfig) { |
| 398 | if (action->isChecked()) { | 404 | if (action->isChecked()) { |
| 399 | mainViewShadowTaskConfig->setPreset("Enabled"); | 405 | mainViewShadowTaskConfig->setPreset("Enabled"); |
| 400 | } else { | 406 | } else { |
| 401 | mainViewShadowTaskConfig->setPreset("None"); | 407 | mainViewShadowTaskConfig->setPreset("None"); |
| 402 | } | 408 | } |
| 403 | } | 409 | }*/ |
| 404 | } | 410 | } |
| 405 | }); | 411 | }); |
| 406 | 412 | ||
| @@ -408,14 +414,24 @@ Menu::Menu() { · 1 unmodified line | |||
| 408 | connect(action, &QAction::triggered, [action] { | 414 | connect(action, &QAction::triggered, [action] { |
| 409 | auto renderConfig = qApp->getRenderEngine()->getConfiguration(); | 415 | auto renderConfig = qApp->getRenderEngine()->getConfiguration(); |
| 410 | if (renderConfig) { | 416 | if (renderConfig) { |
| 411 | auto mainViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("RenderMainView.AmbientOcclusion"); | 417 | auto lightingModelConfig = renderConfig->getConfig<MakeLightingModel>("RenderMainView.LightingModel"); |
| 418 | if (lightingModelConfig) { | ||
| 419 | lightingModelConfig->setAmbientOcclusion(action->isChecked()); | ||
| 420 | /* if (action->isChecked()) { | ||
| 421 | lightingModelConfig->setPreset("Enabled"); | ||
| 422 | } | ||
| 423 | else { | ||
| 424 | mainViewAmbientOcclusionConfig->setPreset("None"); | ||
| 425 | }*/ | ||
| 426 | } | ||
| 427 | /* auto mainViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("RenderMainView.AmbientOcclusion"); | ||
| 412 | if (mainViewAmbientOcclusionConfig) { | 428 | if (mainViewAmbientOcclusionConfig) { |
| 413 | if (action->isChecked()) { | 429 | if (action->isChecked()) { |
| 414 | mainViewAmbientOcclusionConfig->setPreset("Enabled"); | 430 | mainViewAmbientOcclusionConfig->setPreset("Enabled"); |
| 415 | } else { | 431 | } else { |
| 416 | mainViewAmbientOcclusionConfig->setPreset("None"); | 432 | mainViewAmbientOcclusionConfig->setPreset("None"); |
| 417 | } | 433 | } |
| 418 | } | 434 | }*/ |
| 419 | } | 435 | } |
| 420 | }); | 436 | }); |
| 421 | 437 | ||