diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-06-20 15:45:54 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-06-20 16:34:07 +0300 |
| commit | 74e1374b246f0b6d8c4560f052b9f880c41603ab (patch) | |
| tree | 6d2556df3f2ec0e8c5edb1c81557d7aa62705e57 /src/engine | |
| parent | 46a1400d950a735d85fb061b1d7264f1f8d3c542 (diff) | |
Add matteEnabled to viewer settings
The flag is required to disable clearing to black in qml applications,
which support transparency.
Task-number: QT3DS-3689
Task-number: QT3DS-3542
Change-Id: I27b1e07a394be30f0fb4841c69555dde5697a5cf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Jari Karppinen <jari.karppinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp | 1 | ||||
| -rw-r--r-- | src/engine/Qt3DSRuntimeView.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp b/src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp index b41c83b..0451570 100644 --- a/src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp +++ b/src/engine/Qt3DSRenderRuntimeBindingImplRenderer.cpp @@ -167,6 +167,7 @@ struct SRenderer : public Q3DStudio::ITegraApplicationRenderEngine } void SetMatteColor(Option<QT3DSVec4> inColor) override { m_Context->SetMatteColor(inColor); } + void setMatteEnabled(bool enabled) override { m_Context->setMatteEnabled(enabled); }; virtual void PushState() { m_StateStack.push_back(m_Viewport); } virtual void PopState() { diff --git a/src/engine/Qt3DSRuntimeView.h b/src/engine/Qt3DSRuntimeView.h index 22d8cba..7d86022 100644 --- a/src/engine/Qt3DSRuntimeView.h +++ b/src/engine/Qt3DSRuntimeView.h @@ -143,6 +143,7 @@ public: virtual ITegraRenderStateManager &GetTegraRenderStateManager() = 0; virtual qt3ds::render::NVRenderContext &GetRenderContext() = 0; virtual void SetMatteColor(qt3ds::foundation::Option<qt3ds::QT3DSVec4> inColor) = 0; + virtual void setMatteEnabled(bool enable) = 0; virtual void EnableRenderRotation(bool inEnable) = 0; virtual void SetWriteOutShaderCache(bool inWriteOutShaderCache) = 0; virtual void Release() = 0; |