diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
| commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
| tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 /examples/qt3d/examples-common/qt3dwindow.h | |
| parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) | |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qt3dwindow.h')
| -rw-r--r-- | examples/qt3d/examples-common/qt3dwindow.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/examples/qt3d/examples-common/qt3dwindow.h b/examples/qt3d/examples-common/qt3dwindow.h index 90b660112..5cb71d1d9 100644 --- a/examples/qt3d/examples-common/qt3dwindow.h +++ b/examples/qt3d/examples-common/qt3dwindow.h @@ -64,11 +64,14 @@ class QEntity; namespace Qt3DRender { class QCamera; class QFrameGraphNode; -class QForwardRenderer; class QRenderAspect; class QRenderSettings; } +namespace Qt3DExtras { +class QForwardRenderer; +} + namespace Qt3DInput { class QInputAspect; class QInputSettings; @@ -92,7 +95,7 @@ public: void setActiveFrameGraph(Qt3DRender::QFrameGraphNode *activeFrameGraph); Qt3DRender::QFrameGraphNode *activeFrameGraph() const; - Qt3DRender::QForwardRenderer *defaultFramegraph() const; + Qt3DExtras::QForwardRenderer *defaultFramegraph() const; Qt3DRender::QCamera *camera() const; @@ -114,7 +117,7 @@ private: // Renderer configuration Qt3DRender::QRenderSettings *m_renderSettings; - Qt3DRender::QForwardRenderer *m_forwardRenderer; + Qt3DExtras::QForwardRenderer *m_forwardRenderer; Qt3DRender::QCamera *m_defaultCamera; // Input configuration |