Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 4 files). Show all
Unified · Split
| @@ -315,21 +315,23 @@ void setupPreferences() { · 314 unmodified lines | ||
| 315 | 315 | static const QString RENDER("Graphics"); |
| 316 | 316 | auto renderConfig = qApp->getRenderEngine()->getConfiguration(); |
| 317 | 317 | if (renderConfig) { |
| 318 | − auto ambientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>(); | |
| 319 | − if (ambientOcclusionConfig) { | |
| 320 | − auto getter = [ambientOcclusionConfig]()->QString { return ambientOcclusionConfig->getPreset(); }; | |
| 321 | − auto setter = [ambientOcclusionConfig](QString preset) { ambientOcclusionConfig->setPreset(preset); }; | |
| 318 | + auto mainViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("RenderMainView.AmbientOcclusion"); | |
| 319 | + auto camViewAmbientOcclusionConfig = renderConfig->getConfig<AmbientOcclusionEffect>("SecondaryCameraJob.AmbientOcclusion"); | |
| 320 | + if (mainViewAmbientOcclusionConfig && camViewAmbientOcclusionConfig) { | |
| 321 | + auto getter = [mainViewAmbientOcclusionConfig]()->QString { return mainViewAmbientOcclusionConfig->getPreset(); }; | |
| 322 | + auto setter = [mainViewAmbientOcclusionConfig, camViewAmbientOcclusionConfig](QString preset) { mainViewAmbientOcclusionConfig->setPreset(preset); camViewAmbientOcclusionConfig->setPreset(preset); }; | |
| 322 | 323 | auto preference = new ComboBoxPreference(RENDER, "Ambient occlusion", getter, setter); |
| 323 | − preference->setItems(ambientOcclusionConfig->getPresetList()); | |
| 324 | + preference->setItems(mainViewAmbientOcclusionConfig->getPresetList()); | |
| 324 | 325 | preferences->addPreference(preference); |
| 325 | 326 | } |
| 326 | 327 | |
| 327 | − auto shadowConfig = renderConfig->getConfig<RenderShadowTask>(); | |
| 328 | − if (shadowConfig) { | |
| 329 | − auto getter = [shadowConfig]()->QString { return shadowConfig->getPreset(); }; | |
| 330 | − auto setter = [shadowConfig](QString preset) { shadowConfig->setPreset(preset); }; | |
| 328 | + auto mainViewShadowConfig = renderConfig->getConfig<RenderShadowTask>("RenderMainView.RenderShadowTask"); | |
| 329 | + auto camViewShadowConfig = renderConfig->getConfig<RenderShadowTask>("SecondaryCameraJob.RenderShadowTask"); | |
| 330 | + if (mainViewShadowConfig && camViewShadowConfig) { | |
| 331 | + auto getter = [mainViewShadowConfig]()->QString { return mainViewShadowConfig->getPreset(); }; | |
| 332 | + auto setter = [mainViewShadowConfig, camViewShadowConfig](QString preset) { mainViewShadowConfig->setPreset(preset); camViewShadowConfig->setPreset(preset); }; | |
| 331 | 333 | auto preference = new ComboBoxPreference(RENDER, "Shadows", getter, setter); |
| 332 | − preference->setItems(shadowConfig->getPresetList()); | |
| 334 | + preference->setItems(mainViewShadowConfig->getPresetList()); | |
| 333 | 335 | preferences->addPreference(preference); |
| 334 | 336 | } |
| 335 | 337 | } |