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 /examples/qt3d/examples-common/qt3dquickwindow.cpp | |
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 'examples/qt3d/examples-common/qt3dquickwindow.cpp')
-rw-r--r-- | examples/qt3d/examples-common/qt3dquickwindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/qt3d/examples-common/qt3dquickwindow.cpp b/examples/qt3d/examples-common/qt3dquickwindow.cpp index f43df0bd8..72e10c34e 100644 --- a/examples/qt3d/examples-common/qt3dquickwindow.cpp +++ b/examples/qt3d/examples-common/qt3dquickwindow.cpp @@ -52,7 +52,7 @@ #include <Qt3DQuick/QQmlAspectEngine> #include <Qt3DRender/qcamera.h> #include <Qt3DRender/qrenderaspect.h> -#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qrendersettings.h> #include <Qt3DRender/qrendersurfaceselector.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DInput/qinputsettings.h> @@ -193,14 +193,14 @@ void Qt3DQuickWindow::setWindowSurface(QObject *rootObject) { // Find surface selector in framegraph and set ourselves up as the // render surface there - Qt3DRender::QFrameGraph *frameGraphComponent - = rootObject->findChild<Qt3DRender::QFrameGraph *>(); - if (!frameGraphComponent) { - qWarning() << "No frame graph component found"; + Qt3DRender::QRenderSettings *rendererSettings + = rootObject->findChild<Qt3DRender::QRenderSettings *>(); + if (!rendererSettings) { + qWarning() << "No renderer settings component found"; return; } - Qt3DCore::QNode *frameGraphRoot = frameGraphComponent->activeFrameGraph(); + Qt3DCore::QNode *frameGraphRoot = rendererSettings->activeFrameGraph(); if (!frameGraphRoot) { qWarning() << "No active frame graph found"; return; |