diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 16:34:38 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:17:00 +0200 |
| commit | 16749ae5dbab2caa67d816a6778cdfd92e9510ac (patch) | |
| tree | 0ba6bdf2723ec11033683f79244f5595f024feb9 /examples | |
| parent | afdfd50d4465b4d5725939134079e472933352ec (diff) | |
QRenderPassFilter: renamed criteria property to includes
Change-Id: I4422614e5ac7ebe4de08a6b5eee18c32406bb325
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
4 files changed, 9 insertions, 9 deletions
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.cpp b/examples/deferred-renderer-cpp/deferredrenderer.cpp index 5d328fcaf..607ae96c6 100644 --- a/examples/deferred-renderer-cpp/deferredrenderer.cpp +++ b/examples/deferred-renderer-cpp/deferredrenderer.cpp @@ -70,7 +70,7 @@ void DeferredRenderer::setGBuffer(Qt3D::QRenderTarget *gBuffer) void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria) { Q_FOREACH (Qt3D::QAnnotation *c, criteria) - m_geometryPassFilter->addCriterion(c); + m_geometryPassFilter->addInclude(c); } void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria) diff --git a/examples/deferred-renderer-qml/DeferredRenderer.qml b/examples/deferred-renderer-qml/DeferredRenderer.qml index 810f0dce9..e3e9bf834 100644 --- a/examples/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/deferred-renderer-qml/DeferredRenderer.qml @@ -59,7 +59,7 @@ Viewport { RenderPassFilter { id : geometryPass - criteria : Annotation { name : "pass"; value : "geometry" } + includes : Annotation { name : "pass"; value : "geometry" } CameraSelector { id : sceneCameraSelector @@ -77,7 +77,7 @@ Viewport { RenderPassFilter { id : finalPass - criteria : Annotation { name : "pass"; value : "final" } + includes : Annotation { name : "pass"; value : "final" } } } diff --git a/examples/playground-qml/ForwardRenderer.qml b/examples/playground-qml/ForwardRenderer.qml index fe8b187a1..9feda4d6d 100644 --- a/examples/playground-qml/ForwardRenderer.qml +++ b/examples/playground-qml/ForwardRenderer.qml @@ -84,7 +84,7 @@ TechniqueFilter { LayerFilter { id : layerFilter objectName : "layerFilter" - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "TextureLighting";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "TextureLighting";}] } } } } @@ -108,10 +108,10 @@ TechniqueFilter { } ] } - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Texture";}] } - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Lighting";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "Texture";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "Lighting";}] } } - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Final";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "Final";}] } } } } diff --git a/examples/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/shadow-map-qml/ShadowMapFrameGraph.qml index 7164c0ffc..592412bc1 100644 --- a/examples/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/shadow-map-qml/ShadowMapFrameGraph.qml @@ -62,7 +62,7 @@ FrameGraph { clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0) RenderPassFilter { - criteria: [ Annotation { name: "pass"; value: "shadowmap" } ] + includes: [ Annotation { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -96,7 +96,7 @@ FrameGraph { } RenderPassFilter { - criteria: [ Annotation { name: "pass"; value: "forward" } ] + includes: [ Annotation { name: "pass"; value: "forward" } ] ClearBuffer { buffers: ClearBuffer.ColorDepthBuffer |