diff options
| author | Wieland Hagen <wieland.hagen@kdab.com> | 2016-02-17 17:53:42 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-09 13:19:39 +0000 |
| commit | c042228267dc4bb05ee3e6d53074c7218d1e7054 (patch) | |
| tree | aacbe10f48912e9324526e64d722377143d542cc /tests/benchmarks | |
| parent | 807a25d74550faf42ed79dfe234b5f1ce3380cf4 (diff) | |
Drop QFrameGraph in favor of QRenderSettings
QFrameGraph did store just the Frame Graph Root, and was not configurable
at runtime. This functionality has been moved to QRenderSettings.
The renderer now gets the scene graph root directly from QRenderSettings.
Change-Id: I3012eb96b8073717f96f5e42374859a3f4a89bfc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/render/jobs/tst_bench_jobs.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp index 3c85752b3..305cd8094 100644 --- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp +++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp @@ -31,10 +31,10 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> #include <Qt3DRender/QMaterial> -#include <Qt3DRender/QFrameGraph> #include <Qt3DRender/QForwardRenderer> #include <Qt3DRender/QPhongMaterial> #include <Qt3DRender/QCylinderMesh> +#include <Qt3DRender/QRenderSettings> #include <Qt3DRender/private/managers_p.h> #include <Qt3DCore/private/qresourcemanager_p.h> @@ -164,13 +164,12 @@ Qt3DCore::QEntity *buildBigScene() cameraEntity->setViewCenter(QVector3D(0, 0, 0)); // FrameGraph - Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph(); + Qt3DRender::QRenderSettings* renderSettings = new Qt3DRender::QRenderSettings(); Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer(); forwardRenderer->setCamera(cameraEntity); forwardRenderer->setClearColor(Qt::black); - frameGraph->setActiveFrameGraph(forwardRenderer); - root->addComponent(frameGraph); - + renderSettings->setActiveFrameGraph(forwardRenderer); + root->addComponent(renderSettings); const float radius = 100.0f; const int max = 1000; |