diff options
author | Määttä Antti <antti.maatta@qt.io> | 2018-06-13 16:21:50 +0300 |
---|---|---|
committer | Antti Määttä <antti.maatta@qt.io> | 2018-08-01 05:53:51 +0000 |
commit | 825651b6e975ffbc1069c0d747018fff2f232cb7 (patch) | |
tree | cf0f58da5c785976687ca26c82fdd9cb8d8077f6 /src/Authoring/Studio/Render/StudioRenderer.cpp | |
parent | da284e3bd0bc5972f84fb247f82e198261112c31 (diff) |
Implement scene view preview in edit modes
Task-number: QT3DS-250
Change-Id: Iaf7bf245ebf3de00339f5cbfb0f9fc2d4f099373
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Render/StudioRenderer.cpp')
-rw-r--r-- | src/Authoring/Studio/Render/StudioRenderer.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index b958a8d4..cee03111 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -398,14 +398,23 @@ struct SRendererImpl : public IStudioRenderer, if (!m_Closed && IsInitialized()) { m_RenderContext->BeginRender(); if (m_Translation) - m_Translation->PreRender(); + m_Translation->PreRender(false); NVRenderContext &theContext = m_RenderContext->GetRenderContext(); theContext.SetDepthWriteEnabled(true); theContext.Clear(qt3ds::render::NVRenderClearFlags( qt3ds::render::NVRenderClearValues::Color | qt3ds::render::NVRenderClearValues::Depth)); if (m_Translation) { - m_Translation->Render(m_PickResult.GetWidgetId(), m_GuidesEnabled); + m_Translation->Render(m_PickResult.GetWidgetId(), m_GuidesEnabled, false); + + // draw scene preview view screen display area layer + if (CStudioPreferences::showEditModePreview() + && m_Translation->m_EditCameraEnabled + && !m_Translation->GetPreviewViewportDimensions().isZero()) { + m_Translation->PreRender(true); + m_Translation->Render(0, false, true); + } } + m_RenderContext->EndRender(); } } |