diff options
author | Mike Krus <mike.krus@kdab.com> | 2017-04-11 11:26:32 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2017-05-21 11:40:05 +0000 |
commit | ab0f38728cda3a5c819de6172febb0908c101967 (patch) | |
tree | 8cdb78e6c03c473d1d4e851b09719c5af16ac927 /src/render/backend | |
parent | b3302278a1e6094b17d4c7bd353e7717ee050bb5 (diff) |
Add support for remote content in SceneLoader
Task-number: QTBUG-57614
Change-Id: I687a9620865f5849aaba2aadb5a9c3746afb0b53
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend')
-rw-r--r-- | src/render/backend/renderer.cpp | 8 | ||||
-rw-r--r-- | src/render/backend/renderer_p.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index bd8687d5e..6cc0dba7b 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -68,6 +68,7 @@ #include <Qt3DRender/private/technique_p.h> #include <Qt3DRender/private/renderthread_p.h> #include <Qt3DRender/private/renderview_p.h> +#include <Qt3DRender/private/scenemanager_p.h> #include <Qt3DRender/private/techniquefilternode_p.h> #include <Qt3DRender/private/viewportnode_p.h> #include <Qt3DRender/private/vsyncframeadvanceservice_p.h> @@ -279,6 +280,13 @@ void Renderer::setNodeManagers(NodeManagers *managers) m_filterCompatibleTechniqueJob->setManager(m_nodesManager->techniqueManager()); } +void Renderer::setServices(QServiceLocator *services) +{ + m_services = services; + + m_nodesManager->sceneManager()->setDownloadService(m_services->downloadHelperService()); +} + NodeManagers *Renderer::nodeManagers() const { return m_nodesManager; diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index af10108e9..de0b2a59b 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -157,7 +157,7 @@ public: void setTime(qint64 time) Q_DECL_OVERRIDE; void setNodeManagers(NodeManagers *managers) Q_DECL_OVERRIDE; - void setServices(Qt3DCore::QServiceLocator *services) Q_DECL_OVERRIDE { m_services = services; } + void setServices(Qt3DCore::QServiceLocator *services) Q_DECL_OVERRIDE; void setSurfaceExposed(bool exposed) Q_DECL_OVERRIDE; NodeManagers *nodeManagers() const Q_DECL_OVERRIDE; |