diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-03-12 16:39:45 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-13 08:48:38 +0000 |
| commit | 4e660c9e976e64079856b8cc817c4ef171b83604 (patch) | |
| tree | c36114eac2625d06949c972fd9da137255312f4b /src/quick3d/imports | |
| parent | 7d616f68b0615f73fcef7222eb800576fbbfd718 (diff) | |
QRenderAspect: move some code to pimpl
Change-Id: Ie54d6bab2b22088f3b857b19e9df5a03371eff61
Task-number: QTBUG-51510
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/scene3d/importsscene3d.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/imports/scene3d/scene3drenderer.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/quick3d/imports/scene3d/importsscene3d.pro b/src/quick3d/imports/scene3d/importsscene3d.pro index 2812b15b0..b3d237d7b 100644 --- a/src/quick3d/imports/scene3d/importsscene3d.pro +++ b/src/quick3d/imports/scene3d/importsscene3d.pro @@ -2,7 +2,7 @@ CXX_MODULE = qml TARGET = qtquickscene3dplugin TARGETPATH = QtQuick/Scene3D -QT += qml quick 3dcore 3drender 3dinput +QT += qml quick 3dcore 3drender 3drender-private 3dinput HEADERS += \ qtquickscene3dplugin.h \ diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 61f2aafb9..a4071a2f3 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -44,6 +44,7 @@ #include "scene3dsgnode_p.h" #include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/private/qrenderaspect_p.h> #include <Qt3DCore/qaspectengine.h> #include <QtQuick/qquickwindow.h> @@ -128,7 +129,7 @@ Scene3DRenderer::Scene3DRenderer(Scene3DItem *item, Qt3DCore::QAspectEngine *asp QObject::connect(m_item, &QQuickItem::windowChanged, this, &Scene3DRenderer::onWindowChangedQueued, Qt::QueuedConnection); ContextSaver saver; - m_renderAspect->renderInitialize(saver.context()); + static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect))->renderInitialize(saver.context()); scheduleRootEntityChange(); } @@ -179,7 +180,7 @@ void Scene3DRenderer::shutdown() // Shutdown the Renderer Aspect while the OpenGL context // is still valid if (m_renderAspect) - m_renderAspect->renderShutdown(); + static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect))->renderShutdown(); } // SGThread @@ -254,7 +255,7 @@ void Scene3DRenderer::render() m_multisampledFBO->bind(); // Render Qt3D Scene - m_renderAspect->renderSynchronous(); + static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect))->renderSynchronous(); // We may have called doneCurrent() so restore the context. if (saver.context()->surface() != saver.surface()) @@ -277,7 +278,7 @@ void Scene3DRenderer::render() m_finalFBO->bind(); // Render Qt3D Scene - m_renderAspect->renderSynchronous(); + static_cast<QRenderAspectPrivate*>(QRenderAspectPrivate::get(m_renderAspect))->renderSynchronous(); // We may have called doneCurrent() so restore the context. if (saver.context()->surface() != saver.surface()) |