diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/extras/defaults/qforwardrenderer.cpp | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/extras/defaults/qforwardrenderer.cpp')
-rw-r--r-- | src/extras/defaults/qforwardrenderer.cpp | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp index d556b58d3..3a5c6803b 100644 --- a/src/extras/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -134,6 +134,8 @@ QForwardRenderer::QForwardRenderer(QNode *parent) QObject::connect(d->m_cameraSelector, &QCameraSelector::cameraChanged, this, &QForwardRenderer::cameraChanged); QObject::connect(d->m_surfaceSelector, &QRenderSurfaceSelector::surfaceChanged, this, &QForwardRenderer::surfaceChanged); QObject::connect(d->m_surfaceSelector, &QRenderSurfaceSelector::externalRenderTargetSizeChanged, this, &QForwardRenderer::externalRenderTargetSizeChanged); + QObject::connect(d->m_frustumCulling, &QFrustumCulling::enabledChanged, this, &QForwardRenderer::frustumCullingEnabledChanged); + QObject::connect(d->m_viewport, &QViewport::gammaChanged, this, &QForwardRenderer::gammaChanged); d->init(); } @@ -171,6 +173,18 @@ void QForwardRenderer::setExternalRenderTargetSize(const QSize &size) d->m_surfaceSelector->setExternalRenderTargetSize(size); } +void QForwardRenderer::setFrustumCullingEnabled(bool enabled) +{ + Q_D(QForwardRenderer); + d->m_frustumCulling->setEnabled(enabled); +} + +void QForwardRenderer::setGamma(float gamma) +{ + Q_D(QForwardRenderer); + d->m_viewport->setGamma(gamma); +} + /*! \qmlproperty rect ForwardRenderer::viewportRect @@ -226,6 +240,21 @@ Qt3DCore::QEntity *QForwardRenderer::camera() const } /*! + \qmlproperty Object ForwardRenderer::window + + Holds the current render surface. + + \deprecated +*/ +/*! + \property QForwardRenderer::window + + Holds the current render surface. + + \deprecated +*/ + +/*! \qmlproperty Object ForwardRenderer::surface Holds the current render surface. @@ -247,6 +276,38 @@ QSize QForwardRenderer::externalRenderTargetSize() const return d->m_surfaceSelector->externalRenderTargetSize(); } +/*! + \qmlproperty color ForwardRenderer::frustumCulling + + Indicates if the renderer applies frustum culling to the scene. +*/ +/*! + \property QForwardRenderer::frustumCulling + + Indicates if the renderer applies frustum culling to the scene. +*/ +bool QForwardRenderer::isFrustumCullingEnabled() const +{ + Q_D(const QForwardRenderer); + return d->m_frustumCulling->isEnabled(); +} + +/*! + \qmlproperty color ForwardRenderer::gamma + + Holds the gamma value the renderer applies to the scene. +*/ +/*! + \property QForwardRenderer::gamma + + Holds the gamma value the renderer applies to the scene. +*/ +float QForwardRenderer::gamma() const +{ + Q_D(const QForwardRenderer); + return d->m_viewport->gamma(); +} + } // namespace Qt3DExtras QT_END_NAMESPACE |