diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-23 12:33:09 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-24 16:53:24 +0000 |
| commit | e088dde9105c42542d966903dc0e8891d6a870f6 (patch) | |
| tree | 2abbe88e146e9538b0a8a025c6669b850d576e37 /tests | |
| parent | 28fccfbe715251f307d407b03b64cb4936fee9e7 (diff) | |
QRenderAspect/Renderer: refactored to use the AbstractRenderer interface
Change-Id: I662577e6dd337b1f056f73b4a11262e902d4dde2
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/benchmarks/render/jobs/tst_bench_jobs.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp index 2614c4e4c..22340b663 100644 --- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp +++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp @@ -96,36 +96,37 @@ public: QVector<Qt3DCore::QAspectJobPtr> worldTransformJob() { - d_func()->m_worldTransformJob->setRoot(d_func()->m_renderer->renderSceneRoot()); + d_func()->m_worldTransformJob->setRoot(d_func()->m_renderer->sceneRoot()); return QVector<Qt3DCore::QAspectJobPtr>() << d_func()->m_worldTransformJob; } QVector<Qt3DCore::QAspectJobPtr> updateBoundingJob() { - d_func()->m_updateBoundingVolumeJob->setRoot(d_func()->m_renderer->renderSceneRoot()); + d_func()->m_updateBoundingVolumeJob->setRoot(d_func()->m_renderer->sceneRoot()); return QVector<Qt3DCore::QAspectJobPtr>() << d_func()->m_updateBoundingVolumeJob; } QVector<Qt3DCore::QAspectJobPtr> calculateBoundingVolumeJob() { - d_func()->m_calculateBoundingVolumeJob->setRoot(d_func()->m_renderer->renderSceneRoot()); + d_func()->m_calculateBoundingVolumeJob->setRoot(d_func()->m_renderer->sceneRoot()); return QVector<Qt3DCore::QAspectJobPtr>() << d_func()->m_calculateBoundingVolumeJob; } QVector<Qt3DCore::QAspectJobPtr> framePreparationJob() { - d_func()->m_framePreparationJob->setRoot(d_func()->m_renderer->renderSceneRoot()); + d_func()->m_framePreparationJob->setRoot(d_func()->m_renderer->sceneRoot()); return QVector<Qt3DCore::QAspectJobPtr>() << d_func()->m_framePreparationJob; } QVector<Qt3DCore::QAspectJobPtr> frameCleanupJob() { + d_func()->m_cleanupJob->setRoot(d_func()->m_renderer->sceneRoot()); return QVector<Qt3DCore::QAspectJobPtr>() << d_func()->m_cleanupJob; } QVector<Qt3DCore::QAspectJobPtr> renderBinJobs() { - return d_func()->m_renderer->createRenderBinJobs(); + return d_func()->m_renderer->renderBinJobs(); } void setRootEntity(Qt3DCore::QEntity *root) @@ -133,7 +134,7 @@ public: if (!m_window) { Qt3DCore::QNodeVisitor visitor; visitor.traverse(root, this, &TestAspect::visitNode); - d_func()->m_renderer->m_renderSceneRoot = + static_cast<Qt3DRender::Render::Renderer *>(d_func()->m_renderer)->m_renderSceneRoot = d_func()->m_renderer->nodeManagers() ->lookupResource<Qt3DRender::Render::Entity, Qt3DRender::Render::EntityManager>(root->id()); } else { |