summaryrefslogtreecommitdiffstats
path: root/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2019-04-16 13:42:13 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2019-05-02 10:19:23 +0000
commit3dc7636713c98ce2748d367f8525fcab85a6c425 (patch)
tree12411317058e10feae817e25c33f0e5e24577298 /src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
parent437593e677cd1ed85ef846a3488dc3212fdde54a (diff)
Support alpha channel initial work
In this initial work, all (almost) color properties are converted into a new type (float4) to support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene background properties only. The following is remaining: - Scene background alpha doesn't work in the editor (works in the viewer RT1) Task-number: QT3DS-3128 Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp')
-rw-r--r--src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
index fd00e647..4ef33604 100644
--- a/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
+++ b/src/Runtime/Source/engine/Qt3DSRenderRuntimeBinding.cpp
@@ -115,7 +115,7 @@ struct Qt3DSRenderSceneSubPresRenderer : public CSubPresentationRenderer
const SRenderInstanceId instanceId) override;
void RenderWithClear(const SOffscreenRendererEnvironment &inEnvironment,
NVRenderContext &inRenderContext, QT3DSVec2 inPresScale,
- SScene::RenderClearCommand inClearBuffer, QT3DSVec3 inClearColor,
+ SScene::RenderClearCommand inClearBuffer, QT3DSVec4 inClearColor,
const SRenderInstanceId instanceId) override;
};
@@ -805,7 +805,7 @@ void Qt3DSRenderSceneSubPresRenderer::Render(const SOffscreenRendererEnvironment
void Qt3DSRenderSceneSubPresRenderer::RenderWithClear(
const SOffscreenRendererEnvironment &inEnvironment,
NVRenderContext &inRenderContext, QT3DSVec2 inPresScale,
- SScene::RenderClearCommand inClearBuffer, QT3DSVec3 inClearColor,
+ SScene::RenderClearCommand inClearBuffer, QT3DSVec4 inClearColor,
const SRenderInstanceId id)
{
CSubPresentationRenderer::RenderWithClear(inEnvironment, inRenderContext,
@@ -1554,7 +1554,7 @@ struct Qt3DSRenderSceneManager : public Q3DStudio::ISceneManager,
if (theFirstScene->m_Presentation->m_Scene
&& theFirstScene->m_Presentation->m_Scene->m_UseClearColor) {
m_Context->m_Context->SetSceneColor(
- QT3DSVec4(theFirstScene->m_Presentation->m_Scene->m_ClearColor, 1.0f));
+ theFirstScene->m_Presentation->m_Scene->m_ClearColor);
} else
m_Context->m_Context->SetSceneColor(QT3DSVec4(0.0f, 0.0f, 0.0f, 0.0f));