From e088dde9105c42542d966903dc0e8891d6a870f6 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 23 Nov 2015 12:33:09 +0100 Subject: QRenderAspect/Renderer: refactored to use the AbstractRenderer interface Change-Id: I662577e6dd337b1f056f73b4a11262e902d4dde2 Reviewed-by: Andy Nichols --- src/render/jobs/loadscenejob.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/render/jobs/loadscenejob.cpp') diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp index 4eb857775..cb39f70df 100644 --- a/src/render/jobs/loadscenejob.cpp +++ b/src/render/jobs/loadscenejob.cpp @@ -48,26 +48,26 @@ namespace Render { LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &m_sceneComponent) : QAspectJob() - , m_renderer(Q_NULLPTR) , m_source(source) , m_sceneComponent(m_sceneComponent) + , m_managers(Q_NULLPTR) { } void LoadSceneJob::run() { - Qt3DCore::QEntity *sceneTree = m_renderer->nodeManagers()->sceneManager()->sceneTreeFromSource(m_source); + Qt3DCore::QEntity *sceneTree = m_managers->sceneManager()->sceneTreeFromSource(m_source); if (sceneTree == Q_NULLPTR) { - Q_FOREACH (QAbstractSceneParser *parser, m_renderer->sceneParsers()) { + Q_FOREACH (QAbstractSceneParser *parser, m_parsers) { if (parser->isExtensionSupported(m_source)) { parser->setSource(m_source); sceneTree = parser->scene(); - m_renderer->nodeManagers()->sceneManager()->addLoadedSceneTree(m_source, sceneTree); + m_managers->sceneManager()->addLoadedSceneTree(m_source, sceneTree); } } } // set clone of sceneTree in sceneComponent - Scene *scene = m_renderer->nodeManagers()->sceneManager()->lookupResource(m_sceneComponent); + Scene *scene = m_managers->sceneManager()->lookupResource(m_sceneComponent); scene->setSceneSubtree(sceneTree); } -- cgit v1.2.3