diff options
19 files changed, 56 insertions, 56 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp index 57ed077f3..e7b7cb9ce 100644 --- a/examples/qt3d/deferred-renderer-cpp/main.cpp +++ b/examples/qt3d/deferred-renderer-cpp/main.cpp @@ -128,7 +128,7 @@ int main(int ac, char **av) // FrameGraph DeferredRenderer *deferredRenderer = new DeferredRenderer(); deferredRenderer->setClearColor(Qt::black); - deferredRenderer->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); + deferredRenderer->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); deferredRenderer->setFinalPassCriteria(finalEffect->passCriteria()); deferredRenderer->setGeometryPassCriteria(sceneEffect->passCriteria()); deferredRenderer->setGBuffer(gBuffer); diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index d69f9aebb..af7ea6ffc 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -52,7 +52,7 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 Viewport { - rect : Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect : Qt.rect(0.0, 0.0, 1.0, 1.0) property alias gBuffer : gBufferTargetSelector.target property alias camera : sceneCameraSelector.camera diff --git a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp index 8bb081bc8..24a4cc893 100644 --- a/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp +++ b/examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp @@ -56,7 +56,7 @@ ForwardRenderer::ForwardRenderer(Qt3DCore::QNode *parent) , m_cameraSelector(new Qt3DRender::QCameraSelector()) , m_clearBuffer(new Qt3DRender::QClearBuffer()) { - m_viewport->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); + m_viewport->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); m_viewport->setClearColor(Qt::white); m_clearBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer); m_cameraSelector->setParent(m_viewport); diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index a3adb30e1..2aaac4310 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -58,7 +58,7 @@ Entity { components: FrameGraph { Viewport { - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) clearColor: "white" enabled: counter !== 5 diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index 65868a187..7ca9b21e9 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -69,7 +69,7 @@ TechniqueFilter { Viewport { id: viewport objectName : "viewport" - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) clearColor: "white" // Use the specified camera diff --git a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml index 41131175c..ba6316668 100644 --- a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml +++ b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml @@ -65,7 +65,7 @@ FrameGraph { Viewport { id: mainViewport - rect: Qt.rect(0, 0, 1, 1) + normalizedRect: Qt.rect(0, 0, 1, 1) ClearBuffer { buffers: ClearBuffer.ColorDepthBuffer @@ -73,25 +73,25 @@ FrameGraph { Viewport { id: topLeftViewport - rect: Qt.rect(0, 0, 0.5, 0.5) + normalizedRect: Qt.rect(0, 0, 0.5, 0.5) CameraSelector { id: cameraSelectorTopLeftViewport } } Viewport { id: topRightViewport - rect: Qt.rect(0.5, 0, 0.5, 0.5) + normalizedRect: Qt.rect(0.5, 0, 0.5, 0.5) CameraSelector { id: cameraSelectorTopRightViewport } } Viewport { id: bottomLeftViewport - rect: Qt.rect(0, 0.5, 0.5, 0.5) + normalizedRect: Qt.rect(0, 0.5, 0.5, 0.5) CameraSelector { id: cameraSelectorBottomLeftViewport } } Viewport { id: bottomRightViewport - rect: Qt.rect(0.5, 0.5, 0.5, 0.5) + normalizedRect: Qt.rect(0.5, 0.5, 0.5, 0.5) CameraSelector { id: cameraSelectorBottomRightViewport } } } diff --git a/examples/qt3d/picking-qml/main.qml b/examples/qt3d/picking-qml/main.qml index e9b95994d..bc2b501a5 100644 --- a/examples/qt3d/picking-qml/main.qml +++ b/examples/qt3d/picking-qml/main.qml @@ -113,14 +113,14 @@ W.Window NoDraw {} } Viewport { - rect: Qt.rect(0.0, 0.0, 0.5, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 0.5, 1.0) CameraSelector { camera: camera LayerFilter { layers: "content"} } } Viewport { - rect: Qt.rect(0.5, 0.0, 0.5, 1.0) + normalizedRect: Qt.rect(0.5, 0.0, 0.5, 1.0) CameraSelector { camera: camera2 LayerFilter { diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index f0c60ff7c..95dc51ac2 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -60,7 +60,7 @@ FrameGraph { readonly property Texture2D shadowTexture: depthTexture activeFrameGraph: Viewport { - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) clearColor: Qt.rgba(0.0, 0.0, 0.0, 1.0) TechniqueFilter { diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index a5e886e65..ed5a92685 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -79,7 +79,7 @@ TechniqueFilter { // Main Viewport Viewport { id: viewport - rect: Qt.rect(0.0, 0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0, 1.0, 1.0) CameraSelector { id: mainCameraSelector @@ -96,7 +96,7 @@ TechniqueFilter { Viewport { id: detailViewport - rect: Qt.rect(0.75, 0.0, 0.25, 0.25) + normalizedRect: Qt.rect(0.75, 0.0, 0.25, 0.25) CameraSelector { id: detailCameraSelector diff --git a/examples/qt3d/scene3d-loader/AnimatedEntity.qml b/examples/qt3d/scene3d-loader/AnimatedEntity.qml index cb238da97..bf0a16fc4 100644 --- a/examples/qt3d/scene3d-loader/AnimatedEntity.qml +++ b/examples/qt3d/scene3d-loader/AnimatedEntity.qml @@ -75,7 +75,7 @@ Entity { FrameGraph { activeFrameGraph: Viewport { id: viewport - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left clearColor: "transparent" CameraSelector { diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 98d89f227..195869dd8 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -60,7 +60,7 @@ FrameGraph { readonly property Texture2D shadowTexture: depthTexture activeFrameGraph: Viewport { - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0) RenderPassFilter { diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index 597a9a0cb..32753e655 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.qml @@ -67,7 +67,7 @@ TechniqueFilter { // Use the whole viewport Viewport { id: viewport - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) // Use the specified camera CameraSelector { diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml index 110ea88f0..8c95c0066 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml @@ -56,7 +56,7 @@ TechniqueFilter { // Use the whole viewport Viewport { id: viewport - rect: Qt.rect(0.0, 0.0, 1.0, 1.0) + normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) clearColor: "white" // Use the specified camera diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp index 15dbdbf26..a447a6aa8 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/render/defaults/qforwardrenderer.cpp @@ -71,7 +71,7 @@ void QForwardRendererPrivate::init() m_viewport->setParent(m_surfaceSelector); m_surfaceSelector->setParent(q); - m_viewport->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); + m_viewport->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); m_viewport->setClearColor(Qt::white); m_clearBuffer->setBuffers(QClearBuffer::ColorDepthBuffer); @@ -123,7 +123,7 @@ QForwardRenderer::~QForwardRenderer() void QForwardRenderer::setViewportRect(const QRectF &viewportRect) { Q_D(QForwardRenderer); - d->m_viewport->setRect(viewportRect); + d->m_viewport->setNormalizedRect(viewportRect); } void QForwardRenderer::setClearColor(const QColor &clearColor) @@ -152,12 +152,12 @@ void QForwardRenderer::setSurface(QSurface *surface) /*! \property Qt3DRender::QForwardRenderer::viewportRect - Holds the current viewport rect. + Holds the current viewport normalizedRect. */ QRectF QForwardRenderer::viewportRect() const { Q_D(const QForwardRenderer); - return d->m_viewport->rect(); + return d->m_viewport->normalizedRect(); } /*! diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index 8aee112e4..3953c15ce 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -48,7 +48,7 @@ namespace Qt3DRender { QViewportPrivate::QViewportPrivate() : QFrameGraphNodePrivate() - , m_rect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)) + , m_normalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)) { } @@ -56,7 +56,7 @@ void QViewport::copy(const QNode *ref) { QFrameGraphNode::copy(ref); const QViewport *viewport = static_cast<const QViewport*>(ref); - d_func()->m_rect = viewport->d_func()->m_rect; + d_func()->m_normalizedRect = viewport->d_func()->m_normalizedRect; d_func()->m_clearColor = viewport->d_func()->m_clearColor; } @@ -76,18 +76,18 @@ QViewport::QViewport(QViewportPrivate &dd, QNode *parent) { } -QRectF QViewport::rect() const +QRectF QViewport::normalizedRect() const { Q_D(const QViewport); - return d->m_rect; + return d->m_normalizedRect; } -void QViewport::setRect(const QRectF &rect) +void QViewport::setNormalizedRect(const QRectF &normalizedRect) { Q_D(QViewport); - if (rect != d->m_rect) { - d->m_rect = rect; - emit rectChanged(rect); + if (normalizedRect != d->m_normalizedRect) { + d->m_normalizedRect = normalizedRect; + emit normalizedRectChanged(normalizedRect); } } diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index e97210c5b..a53cce1bf 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -53,22 +53,22 @@ class QViewportPrivate; class QT3DRENDERSHARED_EXPORT QViewport : public QFrameGraphNode { Q_OBJECT - Q_PROPERTY(QRectF rect READ rect WRITE setRect NOTIFY rectChanged) + Q_PROPERTY(QRectF normalizedRect READ normalizedRect WRITE setNormalizedRect NOTIFY normalizedRectChanged) Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) public: explicit QViewport(Qt3DCore::QNode *parent = 0); ~QViewport(); - QRectF rect() const; + QRectF normalizedRect() const; QColor clearColor() const; public Q_SLOTS: - void setRect(const QRectF& rect); + void setNormalizedRect(const QRectF& normalizedRect); void setClearColor(const QColor &color); Q_SIGNALS: - void rectChanged(const QRectF& rect); + void normalizedRectChanged(const QRectF& normalizedRect); void clearColorChanged(const QColor &clearColor); protected: diff --git a/src/render/framegraph/qviewport_p.h b/src/render/framegraph/qviewport_p.h index 2271c4fc0..afc7136fa 100644 --- a/src/render/framegraph/qviewport_p.h +++ b/src/render/framegraph/qviewport_p.h @@ -65,7 +65,7 @@ public : QViewportPrivate(); Q_DECLARE_PUBLIC(QViewport) - QRectF m_rect; + QRectF m_normalizedRect; QColor m_clearColor; }; diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp index 1871eb2ba..9fa1684b0 100644 --- a/src/render/framegraph/viewportnode.cpp +++ b/src/render/framegraph/viewportnode.cpp @@ -60,10 +60,10 @@ ViewportNode::ViewportNode() void ViewportNode::updateFromPeer(Qt3DCore::QNode *peer) { QViewport *viewport = static_cast<QViewport *>(peer); - setXMin(viewport->rect().x()); - setXMax(viewport->rect().width()); - setYMin(viewport->rect().y()); - setYMax(viewport->rect().height()); + setXMin(viewport->normalizedRect().x()); + setXMax(viewport->normalizedRect().width()); + setYMin(viewport->normalizedRect().y()); + setYMax(viewport->normalizedRect().height()); m_clearColor = viewport->clearColor(); setEnabled(viewport->isEnabled()); } @@ -114,12 +114,12 @@ void ViewportNode::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("rect")) { - QRectF rect = propertyChange->value().value<QRectF>(); - setXMin(rect.x()); - setYMin(rect.y()); - setXMax(rect.width()); - setYMax(rect.height()); + if (propertyChange->propertyName() == QByteArrayLiteral("normalizedRect")) { + QRectF normalizedRect = propertyChange->value().value<QRectF>(); + setXMin(normalizedRect.x()); + setYMin(normalizedRect.y()); + setXMax(normalizedRect.width()); + setYMax(normalizedRect.height()); } else if (propertyChange->propertyName() == QByteArrayLiteral("clearColor")) { m_clearColor = propertyChange->value().value<QColor>(); diff --git a/tests/auto/render/qviewport/tst_qviewport.cpp b/tests/auto/render/qviewport/tst_qviewport.cpp index c9d82e9f2..949764f32 100644 --- a/tests/auto/render/qviewport/tst_qviewport.cpp +++ b/tests/auto/render/qviewport/tst_qviewport.cpp @@ -50,14 +50,14 @@ private Q_SLOTS: void checkCloning_data() { QTest::addColumn<Qt3DRender::QViewport *>("viewport"); - QTest::addColumn<QRectF>("rect"); + QTest::addColumn<QRectF>("normalizedRect"); QTest::addColumn<QColor>("color"); Qt3DRender::QViewport *defaultConstructed = new Qt3DRender::QViewport(); QTest::newRow("defaultConstructed") << defaultConstructed << QRectF(0.0f, 0.0f, 1.0f, 1.0f) << QColor(); Qt3DRender::QViewport *smallGreenViewport = new Qt3DRender::QViewport(); - smallGreenViewport->setRect(QRectF(0.2f, 0.2f, 0.6f, 0.6f)); + smallGreenViewport->setNormalizedRect(QRectF(0.2f, 0.2f, 0.6f, 0.6f)); smallGreenViewport->setClearColor(QColor(Qt::green)); QTest::newRow("smallGreenViewport") << smallGreenViewport << QRectF(0.2f, 0.2f, 0.6f, 0.6f) << QColor(Qt::green); @@ -67,11 +67,11 @@ private Q_SLOTS: { // GIVEN QFETCH(Qt3DRender::QViewport *, viewport); - QFETCH(QRectF, rect); + QFETCH(QRectF, normalizedRect); QFETCH(QColor, color); // THEN - QCOMPARE(viewport->rect(), rect); + QCOMPARE(viewport->normalizedRect(), normalizedRect); QCOMPARE(viewport->clearColor(), color); // WHEN @@ -80,7 +80,7 @@ private Q_SLOTS: // THEN QVERIFY(clone != Q_NULLPTR); QCOMPARE(viewport->id(), clone->id()); - QCOMPARE(viewport->rect(), clone->rect()); + QCOMPARE(viewport->normalizedRect(), clone->normalizedRect()); QCOMPARE(viewport->clearColor(), clone->clearColor()); delete viewport; @@ -129,13 +129,13 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - viewport->setRect(QRectF(0.5f, 0.5f, 1.0f, 1.0f)); + viewport->setNormalizedRect(QRectF(0.5f, 0.5f, 1.0f, 1.0f)); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "rect"); + QCOMPARE(change->propertyName(), "normalizedRect"); QCOMPARE(change->subjectId(), viewport->id()); QCOMPARE(change->value().value<QRectF>(), QRectF(0.5f, 0.5f, 1.0f, 1.0f)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); @@ -143,20 +143,20 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - viewport->setRect(QRectF(0.5f, 0.5f, 1.0f, 1.0f)); + viewport->setNormalizedRect(QRectF(0.5f, 0.5f, 1.0f, 1.0f)); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 0); // WHEN - viewport->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); + viewport->setNormalizedRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f)); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 1); change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>(); - QCOMPARE(change->propertyName(), "rect"); + QCOMPARE(change->propertyName(), "normalizedRect"); QCOMPARE(change->subjectId(), viewport->id()); QCOMPARE(change->value().value<QRectF>(), QRectF(0.0f, 0.0f, 1.0f, 1.0f)); QCOMPARE(change->type(), Qt3DCore::NodeUpdated); |