diff options
Diffstat (limited to 'src/Runtime/Source/runtimerender/rendererimpl')
4 files changed, 14 insertions, 16 deletions
diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp index 24684861..f2f260fd 100644 --- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp +++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRenderableObjects.cpp @@ -318,7 +318,8 @@ namespace render { context.SetBlendFunction(blendFunc); context.SetBlendEquation(blendEqu); - QT3DSVec4 theColor(m_Text.m_TextColor, m_Text.m_GlobalOpacity); + QT3DSVec4 theColor(m_Text.m_TextColor.x, m_Text.m_TextColor.y, m_Text.m_TextColor.z, + m_Text.m_GlobalOpacity); STextShader &shader(*theInfo.m_Shader); shader.Render(*m_Text.m_TextTexture, *this, theColor, m_ModelViewProjection, @@ -342,8 +343,8 @@ namespace render { context.SetBlendFunction(blendFunc); context.SetBlendEquation(blendEqu); - QT3DSVec4 theColor(m_Text.m_TextColor, m_Text.m_GlobalOpacity); - + QT3DSVec4 theColor(m_Text.m_TextColor.x, m_Text.m_TextColor.y, m_Text.m_TextColor.z, + m_Text.m_GlobalOpacity); STextShader &shader(*theInfo.m_Shader); shader.RenderPath(*m_Text.m_PathFontItem, *m_Text.m_PathFontDetails, *this, theColor, diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp index 7c2603f6..9afb255c 100644 --- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp +++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.cpp @@ -221,7 +221,7 @@ namespace render { } void Qt3DSRendererImpl::RenderLayer(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions, - bool clear, QT3DSVec3 clearColor, bool inRenderSiblings, + bool clear, QT3DSVec4 clearColor, bool inRenderSiblings, const SRenderInstanceId id) { (void)inViewportDimensions; @@ -256,13 +256,10 @@ namespace render { m_BlendFB->Attach(NVRenderFrameBufferAttachments::Color0, *m_LayerBlendTexture); theRenderContext.SetRenderTarget(m_BlendFB); theRenderContext.SetScissorTestEnabled(false); - QT3DSVec4 color(0.0f, 0.0f, 0.0f, 0.0f); - if (clear) { - color.x = clearColor.x; - color.y = clearColor.y; - color.z = clearColor.z; - color.w = 1.0f; - } + QT3DSVec4 color(0.0f); + if (clear) + color = clearColor; + QT3DSVec4 origColor = theRenderContext.GetClearColor(); theRenderContext.SetClearColor(color); theRenderContext.Clear(qt3ds::render::NVRenderClearValues::Color); diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h index e5b39b84..67130904 100644 --- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h +++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImpl.h @@ -318,7 +318,7 @@ namespace render { bool PrepareLayerForRender(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions, bool inRenderSiblings, const SRenderInstanceId id) override; void RenderLayer(SLayer &inLayer, const QT3DSVec2 &inViewportDimensions, - bool clear, QT3DSVec3 clearColor, bool inRenderSiblings, + bool clear, QT3DSVec4 clearColor, bool inRenderSiblings, const SRenderInstanceId id) override; void ChildrenUpdated(SNode &inParent) override; QT3DSF32 GetTextScale(const SText &inText) override; diff --git a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp index 3fb3bc68..eb1563ee 100644 --- a/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp +++ b/src/Runtime/Source/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderData.cpp @@ -1489,9 +1489,9 @@ namespace render { NVRenderContextScopedProperty<NVRenderRect> __viewport( theRenderContext, &NVRenderContext::GetViewport, &NVRenderContext::SetViewport, theNewViewport); - QT3DSVec4 clearColor(0.0); + QT3DSVec4 clearColor(0.0f); if (m_Layer.m_Background == LayerBackground::Color) - clearColor = QT3DSVec4(m_Layer.m_ClearColor, 1.0); + clearColor = m_Layer.m_ClearColor; NVRenderContextScopedProperty<QT3DSVec4> __clearColor( theRenderContext, &NVRenderContext::GetClearColor, &NVRenderContext::SetClearColor, @@ -1768,7 +1768,7 @@ namespace render { SLayerRenderPreparationResult &thePrepResult(*m_LayerPrepResult); NVRenderRectF theScreenRect(thePrepResult.GetLayerToPresentationViewport()); - bool blendingEnabled = m_Layer.m_Background == LayerBackground::Transparent; + bool blendingEnabled = m_Layer.m_Background != LayerBackground::Unspecified; if (!thePrepResult.m_Flags.ShouldRenderToTexture()) { theContext.SetViewport( m_LayerPrepResult->GetLayerToPresentationViewport().ToIntegerRect()); @@ -1778,7 +1778,7 @@ namespace render { if (m_Layer.m_Background == LayerBackground::Color) { NVRenderContextScopedProperty<QT3DSVec4> __clearColor( theContext, &NVRenderContext::GetClearColor, &NVRenderContext::SetClearColor, - QT3DSVec4(m_Layer.m_ClearColor, 0.0f)); + m_Layer.m_ClearColor); theContext.Clear(NVRenderClearValues::Color); } RenderToViewport(); |