diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-15 14:55:49 +0100 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-18 15:55:37 +0000 |
| commit | ed910f364c0730cf2c16c1f59516115761cf8720 (patch) | |
| tree | a6f193c1afee168d57e5750284bf4bd3bf52017b /src/render/backend | |
| parent | a86a10924c97d0966cdbdf9e4db2fc94ed5f2d9a (diff) | |
The Renderer depends only on the QServiceLocator
This way the only thing Renderer knows about QRenderAspect is the enum
controlling the render more (threaded or synchronous). We properly
decoupled both now.
Change-Id: I0023efec541d40f7b499da4355d5cd8b796d2194
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend')
| -rw-r--r-- | src/render/backend/abstractrenderer_p.h | 5 | ||||
| -rw-r--r-- | src/render/backend/renderer.cpp | 3 | ||||
| -rw-r--r-- | src/render/backend/renderer_p.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h index d9126a4ed..78637eb89 100644 --- a/src/render/backend/abstractrenderer_p.h +++ b/src/render/backend/abstractrenderer_p.h @@ -60,6 +60,7 @@ class QAbstractFrameAdvanceService; class QBackendNodeFactory; class QEventFilterService; class QAbstractAspectJobManager; +class QServiceLocator; } namespace Qt3DRender { @@ -88,12 +89,12 @@ public: virtual void setSurface(QSurface *surface) = 0; virtual void setNodeManagers(NodeManagers *managers) = 0; - virtual void setQRenderAspect(Qt3DRender::QRenderAspect *renderAspect) = 0; + virtual void setServices(Qt3DCore::QServiceLocator *services) = 0; virtual void setSurfaceExposed(bool exposed) = 0; virtual QSurface *surface() const = 0; virtual NodeManagers *nodeManagers() const = 0; - virtual QRenderAspect *renderAspect() const = 0; + virtual Qt3DCore::QServiceLocator *services() const = 0; virtual void initialize() = 0; virtual void shutdown() = 0; diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index a79ebdbad..dbb91359c 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -80,7 +80,6 @@ #include <Qt3DCore/qcameralens.h> #include <Qt3DCore/private/qeventfilterservice_p.h> #include <Qt3DCore/private/qabstractaspectjobmanager_p.h> -#include <Qt3DCore/private/qabstractaspect_p.h> #include <QStack> #include <QSurface> @@ -132,7 +131,7 @@ const QString SCENE_PARSERS_PATH = QStringLiteral("/sceneparsers"); */ Renderer::Renderer(QRenderAspect::RenderType type) - : m_rendererAspect(Q_NULLPTR) + : m_services(Q_NULLPTR) , m_nodesManager(Q_NULLPTR) , m_graphicsContext(Q_NULLPTR) , m_surface(Q_NULLPTR) diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index 800efcf34..404b10463 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -128,12 +128,12 @@ public: void setSurface(QSurface *s) Q_DECL_OVERRIDE; void setNodeManagers(NodeManagers *managers) Q_DECL_OVERRIDE { m_nodesManager = managers; } - void setQRenderAspect(QRenderAspect *aspect) Q_DECL_OVERRIDE { m_rendererAspect = aspect; } + void setServices(Qt3DCore::QServiceLocator *services) Q_DECL_OVERRIDE { m_services = services; } void setSurfaceExposed(bool exposed) Q_DECL_OVERRIDE; QSurface *surface() const Q_DECL_OVERRIDE { return m_surface; } NodeManagers *nodeManagers() const Q_DECL_OVERRIDE; - QRenderAspect *renderAspect() const Q_DECL_OVERRIDE { return m_rendererAspect; } + Qt3DCore::QServiceLocator *services() const Q_DECL_OVERRIDE { return m_services; } void initialize() Q_DECL_OVERRIDE; void shutdown() Q_DECL_OVERRIDE; @@ -194,7 +194,7 @@ private: #endif bool canRender() const; - QRenderAspect *m_rendererAspect; + Qt3DCore::QServiceLocator *m_services; NodeManagers *m_nodesManager; // Frame graph root |