History

Clumsy fix for enum storage.

Penguin-Guru committed 5 years ago

Commit 8386f2e1 parent 66fdfa45 files · +13 −14Browse files

Showing the changes to interface/src/scripting/RenderScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

interface/src/scripting/RenderScriptingInterface.cpp+5−6
@@ -28,14 +28,14 @@ void RenderScriptingInterface::loadSettings() { · 27 unmodified lines
28 _renderMethod = (_renderMethodSetting.get());28 _renderMethod = (_renderMethodSetting.get());
29 _shadowsEnabled = (_shadowsEnabledSetting.get());29 _shadowsEnabled = (_shadowsEnabledSetting.get());
30 _ambientOcclusionEnabled = (_ambientOcclusionEnabledSetting.get());30 _ambientOcclusionEnabled = (_ambientOcclusionEnabledSetting.get());
31 _antialiasingMode = (_antialiasingModeSetting.get());31 //_antialiasingMode = (_antialiasingModeSetting.get());
32 _antialiasingMode = static_cast<AntialiasingConfig::Mode>(_antialiasingModeSetting.get());
32 _viewportResolutionScale = (_viewportResolutionScaleSetting.get());33 _viewportResolutionScale = (_viewportResolutionScaleSetting.get());
33 });34 });
34 forceRenderMethod((RenderMethod)_renderMethod);35 forceRenderMethod((RenderMethod)_renderMethod);
35 forceShadowsEnabled(_shadowsEnabled);36 forceShadowsEnabled(_shadowsEnabled);
36 forceAmbientOcclusionEnabled(_ambientOcclusionEnabled);37 forceAmbientOcclusionEnabled(_ambientOcclusionEnabled);
37 forceAntialiasingMode(_antialiasingMode);38 forceAntialiasingMode(_antialiasingMode);
38 forceAntialiasingMode(_antialiasingMode);
39 forceViewportResolutionScale(_viewportResolutionScale);39 forceViewportResolutionScale(_viewportResolutionScale);
40}40}
41 41
@@ -134,13 +134,11 @@ void RenderScriptingInterface::setAntialiasingMode(AntialiasingConfig::Mode mode · 92 unmodified lines
134 134
135void RenderScriptingInterface::forceAntialiasingMode(AntialiasingConfig::Mode mode) {135void RenderScriptingInterface::forceAntialiasingMode(AntialiasingConfig::Mode mode) {
136 _renderSettingLock.withWriteLock([&] {136 _renderSettingLock.withWriteLock([&] {
137 _antialiasingMode = static_cast<AntialiasingConfig::Mode>(mode);137 _antialiasingMode = mode;
138 _antialiasingModeSetting.set(mode);
139 138
140 auto mainViewJitterCamConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<JitterSample>("RenderMainView.JitterCam");139 auto mainViewJitterCamConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<JitterSample>("RenderMainView.JitterCam");
141 auto mainViewAntialiasingConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<Antialiasing>("RenderMainView.Antialiasing");140 auto mainViewAntialiasingConfig = qApp->getRenderEngine()->getConfiguration()->getConfig<Antialiasing>("RenderMainView.Antialiasing");
142 if (mainViewJitterCamConfig && mainViewAntialiasingConfig) {141 if (mainViewJitterCamConfig && mainViewAntialiasingConfig) {
143 Menu::getInstance()->setIsOptionChecked(MenuOption::AntiAliasing, mode);
144 switch (mode) {142 switch (mode) {
145 case AntialiasingConfig::Mode::NONE:143 case AntialiasingConfig::Mode::NONE:
146 mainViewJitterCamConfig->none();144 mainViewJitterCamConfig->none();
@@ -156,12 +154,13 @@ void RenderScriptingInterface::forceAntialiasingMode(AntialiasingConfig::Mode mo · 9 unmodified lines
156 break;154 break;
157 default:155 default:
158 _antialiasingMode = AntialiasingConfig::Mode::NONE;156 _antialiasingMode = AntialiasingConfig::Mode::NONE;
159 _antialiasingModeSetting.set(AntialiasingConfig::Mode::NONE);
160 mainViewJitterCamConfig->none();157 mainViewJitterCamConfig->none();
161 mainViewAntialiasingConfig->setDebugFXAA(false);158 mainViewAntialiasingConfig->setDebugFXAA(false);
162 break;159 break;
163 }160 }
164 }161 }
162
163 _antialiasingModeSetting.set(_antialiasingMode);
165 });164 });
166}165}
167 166