diff options
| author | Wieland Hagen <wieland.hagen@kdab.com> | 2016-02-24 15:35:47 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-09 13:19:41 +0000 |
| commit | a81d9c602574fb666717e73626ab8096aff0699a (patch) | |
| tree | ad5d1ffcd6beb406dde2b5639d8c9f3d06c41665 /examples/qt3d/examples-common/qt3dwindow.cpp | |
| parent | c042228267dc4bb05ee3e6d53074c7218d1e7054 (diff) | |
RenderSettings: add RenderPolicy property
Users may want to explicitly choose a rendering policy,
e.g. RenderOnDemand or AlwaysRender.
Change-Id: I465c5ac671134e7bf42fbd950e475f86edc3a321
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qt3dwindow.cpp')
| -rw-r--r-- | examples/qt3d/examples-common/qt3dwindow.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/qt3d/examples-common/qt3dwindow.cpp b/examples/qt3d/examples-common/qt3dwindow.cpp index 9644042c0..5ad068d62 100644 --- a/examples/qt3d/examples-common/qt3dwindow.cpp +++ b/examples/qt3d/examples-common/qt3dwindow.cpp @@ -71,7 +71,7 @@ Qt3DWindow::Qt3DWindow(QScreen *screen) , m_renderAspect(new Qt3DRender::QRenderAspect) , m_inputAspect(new Qt3DInput::QInputAspect) , m_logicAspect(new Qt3DLogic::QLogicAspect) - , m_rendererSettings(new Qt3DRender::QRenderSettings) + , m_renderSettings(new Qt3DRender::QRenderSettings) , m_forwardRenderer(new Qt3DRender::QForwardRenderer) , m_defaultCamera(new Qt3DRender::QCamera) , m_inputSettings(new Qt3DInput::QInputSettings) @@ -100,7 +100,7 @@ Qt3DWindow::Qt3DWindow(QScreen *screen) m_forwardRenderer->setCamera(m_defaultCamera); m_forwardRenderer->setSurface(this); - m_rendererSettings->setActiveFrameGraph(m_forwardRenderer); + m_renderSettings->setActiveFrameGraph(m_forwardRenderer); m_inputSettings->setEventSource(this); } @@ -111,7 +111,7 @@ Qt3DWindow::Qt3DWindow(QWindow *parent) , m_renderAspect(new Qt3DRender::QRenderAspect) , m_inputAspect(new Qt3DInput::QInputAspect) , m_logicAspect(new Qt3DLogic::QLogicAspect) - , m_rendererSettings(new Qt3DRender::QRenderSettings) + , m_renderSettings(new Qt3DRender::QRenderSettings) , m_defaultCamera(new Qt3DRender::QCamera) , m_inputSettings(new Qt3DInput::QInputSettings) , m_root(new Qt3DCore::QEntity) @@ -139,7 +139,7 @@ Qt3DWindow::Qt3DWindow(QWindow *parent) m_forwardRenderer->setCamera(m_defaultCamera); m_forwardRenderer->setSurface(this); - m_rendererSettings->setActiveFrameGraph(m_forwardRenderer); + m_renderSettings->setActiveFrameGraph(m_forwardRenderer); m_inputSettings->setEventSource(this); } @@ -168,12 +168,12 @@ void Qt3DWindow::setRootEntity(Qt3DCore::QEntity *root) void Qt3DWindow::setActiveFrameGraph(Qt3DRender::QFrameGraphNode *activeFrameGraph) { - m_rendererSettings->setActiveFrameGraph(activeFrameGraph); + m_renderSettings->setActiveFrameGraph(activeFrameGraph); } Qt3DRender::QFrameGraphNode *Qt3DWindow::activeFrameGraph() const { - return m_rendererSettings->activeFrameGraph(); + return m_renderSettings->activeFrameGraph(); } Qt3DRender::QForwardRenderer *Qt3DWindow::defaultFramegraph() const @@ -192,7 +192,7 @@ void Qt3DWindow::showEvent(QShowEvent *e) if (m_userRoot != nullptr) m_userRoot->setParent(m_root); - m_root->addComponent(m_rendererSettings); + m_root->addComponent(m_renderSettings); m_root->addComponent(m_inputSettings); m_aspectEngine->setRootEntity(Qt3DCore::QEntityPtr(m_root)); |