diff options
author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-04-01 15:08:11 +0300 |
---|---|---|
committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-04-16 09:16:37 +0000 |
commit | c6edb9c7d15843e8ab965d365099ace29e2d2049 (patch) | |
tree | 0a24f87676d342c69254e9baeedadaaf4a70e5e5 /src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp | |
parent | 156910d1df8d3f11b72664cf0bf6b7fe800b53cf (diff) |
Add distance field rendering to OpenGL runtime
The old text rendering remains in the background and is used to render
clipped text, since that feature is not yet implemented for distance
field fonts. Building the runtime with Qt version older than 5.12.2 also
causes a fallback to the old text rendering.
Depth pass rendering also needs to be redone in the future to avoid
another full render pass.
Task-number: QT3DS-3210
Change-Id: Ib7666c437d23ae25e1872682f010df3721476a14
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp')
-rw-r--r-- | src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp b/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp index e0eedfd3..3c940805 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderContextCore.cpp @@ -65,6 +65,7 @@ #include "Qt3DSRenderShaderCodeGeneratorV2.h" #include "Qt3DSRenderDefaultMaterialShaderGenerator.h" #include "Qt3DSRenderCustomMaterialShaderGenerator.h" +#include "Qt3DSDistanceFieldRenderer.h" using namespace qt3ds::render; @@ -85,6 +86,7 @@ struct SRenderContextCore : public IQt3DSRenderContextCore NVScopedRefCounted<ITextRendererCore> m_TextRenderer; NVScopedRefCounted<ITextRendererCore> m_OnscreenTexRenderer; NVScopedRefCounted<IPathManagerCore> m_PathManagerCore; + NVScopedRefCounted<ITextRendererCore> m_distanceFieldRenderer; QT3DSI32 mRefCount; SRenderContextCore(NVFoundationBase &fnd, IStringTable &strTable) @@ -127,6 +129,11 @@ struct SRenderContextCore : public IQt3DSRenderContextCore const char8_t *inPrimitivesDirectory) override; void SetTextRendererCore(ITextRendererCore &inRenderer) override { m_TextRenderer = inRenderer; } ITextRendererCore *GetTextRendererCore() override { return m_TextRenderer.mPtr; } + void setDistanceFieldRenderer(ITextRendererCore &inRenderer) override + { + m_distanceFieldRenderer = inRenderer; + } + ITextRendererCore *getDistanceFieldRenderer() override { return m_distanceFieldRenderer.mPtr; } void SetOnscreenTextRendererCore(ITextRendererCore &inRenderer) override { m_OnscreenTexRenderer = inRenderer; @@ -213,6 +220,7 @@ struct SRenderContext : public IQt3DSRenderContext NVScopedRefCounted<IOffscreenRenderManager> m_OffscreenRenderManager; NVScopedRefCounted<IQt3DSRenderer> m_Renderer; NVScopedRefCounted<ITextRenderer> m_TextRenderer; + NVScopedRefCounted<ITextRenderer> m_distanceFieldRenderer; NVScopedRefCounted<ITextRenderer> m_OnscreenTextRenderer; NVScopedRefCounted<ITextTextureCache> m_TextTextureCache; NVScopedRefCounted<ITextTextureAtlas> m_TextTextureAtlas; @@ -307,6 +315,15 @@ struct SRenderContext : public IQt3DSRenderContext m_RenderContext->GetFoundation(), *m_TextRenderer, *m_RenderContext); } +#if QT_VERSION >= QT_VERSION_CHECK(5,12,2) + ITextRendererCore *distanceFieldRenderer = inCore.getDistanceFieldRenderer(); + if (distanceFieldRenderer) { + m_distanceFieldRenderer = distanceFieldRenderer->GetTextRenderer(ctx); + static_cast<Q3DSDistanceFieldRenderer *>(m_distanceFieldRenderer.mPtr) + ->setContext(*this); + } +#endif + ITextRendererCore *theOnscreenTextCore = inCore.GetOnscreenTextRendererCore(); if (theOnscreenTextCore) { m_OnscreenTextRenderer = theOnscreenTextCore->GetTextRenderer(ctx); @@ -381,6 +398,8 @@ struct SRenderContext : public IQt3DSRenderContext ITextRenderer *GetTextRenderer() override { return m_TextRenderer; } + ITextRenderer *getDistanceFieldRenderer() override { return m_distanceFieldRenderer; } + ITextRenderer *GetOnscreenTextRenderer() override { return m_OnscreenTextRenderer; } void SetSceneColor(Option<QT3DSVec4> inSceneColor) override { m_SceneColor = inSceneColor; } @@ -797,6 +816,8 @@ struct SRenderContext : public IQt3DSRenderContext m_TextTextureCache->EndFrame(); if (m_TextRenderer) m_TextRenderer->EndFrame(); + if (m_distanceFieldRenderer) + m_distanceFieldRenderer->EndFrame(); m_OffscreenRenderManager->EndFrame(); m_Renderer->EndFrame(); m_CustomMaterialSystem->EndFrame(); |