History

Shadows are completely working with settings on both pipeline

sam gateau committed 7 years ago

Commit 237fb4d1 parent 5a6f30b18 files · +284 −96Browse files

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

Unified · Split

interface/src/Menu.cpp+20−4
@@ -48,6 +48,7 @@ · 47 unmodified lines
4848 #include "DeferredLightingEffect.h"
4949 #include "PickManager.h"
5050
51+#include "LightingModel.h"
5152 #include "AmbientOcclusionEffect.h"
5253 #include "RenderShadowTask.h"
5354 #include "AntialiasingEffect.h"
@@ -393,14 +394,19 @@ Menu::Menu() { · 339 unmodified lines
393394 connect(action, &QAction::triggered, [action] {
394395 auto renderConfig = qApp->getRenderEngine()->getConfiguration();
395396 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");
397403 if (mainViewShadowTaskConfig) {
398404 if (action->isChecked()) {
399405 mainViewShadowTaskConfig->setPreset("Enabled");
400406 } else {
401407 mainViewShadowTaskConfig->setPreset("None");
402408 }
403− }
409+ }*/
404410 }
405411 });
406412
@@ -408,14 +414,24 @@ Menu::Menu() { · 1 unmodified line
408414 connect(action, &QAction::triggered, [action] {
409415 auto renderConfig = qApp->getRenderEngine()->getConfiguration();
410416 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");
412428 if (mainViewAmbientOcclusionConfig) {
413429 if (action->isChecked()) {
414430 mainViewAmbientOcclusionConfig->setPreset("Enabled");
415431 } else {
416432 mainViewAmbientOcclusionConfig->setPreset("None");
417433 }
418− }
434+ }*/
419435 }
420436 });
421437