diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-02-24 15:15:53 +0000 |
---|---|---|
committer | Robert Brock <robert.brock@kdab.com> | 2016-02-26 09:16:29 +0000 |
commit | 448b80d58dccb8020785752cceb6cbdc4118941c (patch) | |
tree | f0f01b53b8ca1096e0e601ce9ba6c292d6af4b00 /examples/qt3d | |
parent | d95ef5a39732d4f84aa7c779931f849f4b821ed6 (diff) |
Rename the viewport rect property to normalizedRect
As per API review
Change-Id: I51caae419044a297e58745450d5893f2a27db8be
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d')
-rw-r--r-- | examples/qt3d/deferred-renderer-cpp/main.cpp | 2 | ||||
-rw-r--r-- | examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml | 2 | ||||
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/forwardrenderer.cpp | 2 | ||||
-rw-r--r-- | examples/qt3d/enabled-qml/main.qml | 2 | ||||
-rw-r--r-- | examples/qt3d/materials/SortedForwardRenderer.qml | 2 | ||||
-rw-r--r-- | examples/qt3d/multiviewport/QuadViewportFrameGraph.qml | 10 | ||||
-rw-r--r-- | examples/qt3d/picking-qml/main.qml | 4 | ||||
-rw-r--r-- | examples/qt3d/planets-qml/PlanetFrameGraph.qml | 2 | ||||
-rw-r--r-- | examples/qt3d/playground-qml/MyForwardRenderer.qml | 4 | ||||
-rw-r--r-- | examples/qt3d/scene3d-loader/AnimatedEntity.qml | 2 | ||||
-rw-r--r-- | examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml | 2 | ||||
-rw-r--r-- | examples/qt3d/wave/WaveForwardRenderer.qml | 2 |
12 files changed, 18 insertions, 18 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 { |