Showing the changes to interface/src/scripting/RenderScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -19,24 +19,24 @@ RenderScriptingInterface* RenderScriptingInterface::getInstance() { · 18 unmodified lines | |||
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | RenderScriptingInterface::RenderScriptingInterface() { | 21 | RenderScriptingInterface::RenderScriptingInterface() { |
| 22 | setRenderMethod((render::Args::RenderMethod)_renderMethodSetting.get() == render::Args::RenderMethod::DEFERRED ? DEFERRED : FORWARD); | 22 | setRenderMethod((RenderMethod)_renderMethodSetting.get() == RenderMethod::DEFERRED ? RenderMethod::DEFERRED : RenderMethod::FORWARD); |
| 23 | setShadowsEnabled(_shadowsEnabledSetting.get()); | 23 | setShadowsEnabled(_shadowsEnabledSetting.get()); |
| 24 | setAmbientOcclusionEnabled(_ambientOcclusionEnabledSetting.get()); | 24 | setAmbientOcclusionEnabled(_ambientOcclusionEnabledSetting.get()); |
| 25 | setAntialiasingEnabled(_antialiasingEnabledSetting.get()); | 25 | setAntialiasingEnabled(_antialiasingEnabledSetting.get()); |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | QString RenderScriptingInterface::getRenderMethod() { | 28 | RenderScriptingInterface::RenderMethod RenderScriptingInterface::getRenderMethod() { |
| 29 | return (render::Args::RenderMethod)_renderMethodSetting.get() == render::Args::RenderMethod::DEFERRED ? DEFERRED : FORWARD; | 29 | return (RenderMethod)_renderMethodSetting.get() == RenderMethod::DEFERRED ? RenderMethod::DEFERRED : RenderMethod::FORWARD; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | void RenderScriptingInterface::setRenderMethod(const QString& renderMethod) { | 32 | void RenderScriptingInterface::setRenderMethod(RenderScriptingInterface::RenderMethod renderMethod) { |
| 33 | render::Args::RenderMethod newMethod = renderMethod == FORWARD ? render::Args::RenderMethod::FORWARD : render::Args::RenderMethod::DEFERRED; | 33 | RenderMethod newMethod = renderMethod == RenderMethod::FORWARD ? RenderMethod::FORWARD : RenderMethod::DEFERRED; |
| 34 | if (_renderMethodSetting.get() == newMethod) { | 34 | if (_renderMethodSetting.get() == newMethod) { |
| 35 | return; | 35 | return; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | if (QThread::currentThread() != thread()) { | 38 | if (QThread::currentThread() != thread()) { |
| 39 | QMetaObject::invokeMethod(this, "setRenderMethod", Q_ARG(const QString&, renderMethod)); | 39 | QMetaObject::invokeMethod(this, "setRenderMethod", Q_ARG(RenderScriptingInterface::RenderMethod, renderMethod)); |
| 40 | return; | 40 | return; |
| 41 | } | 41 | } |
| 42 | 42 | ||