diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-03-18 17:08:21 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-23 10:05:59 +0000 |
| commit | 74a5c1943db6e8b244ccd2f18485f0d0da3e3ed7 (patch) | |
| tree | 8fe2fded4dda8b53e124bd6ff47ecaf2408522d9 /examples/qt3d | |
| parent | 98ada0f0a9edf5132c08c2603ba20fb5e3001c63 (diff) | |
Class QRenderPassFilter renaming
includes -> matchAny
addInclude -> addMatch
removeInclude -> removeMatch
Change-Id: Ib9288ab79b3e76ae8a8aa2f7e3f20c5386438a25
Task-number: QTBUG-51456
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d')
6 files changed, 13 insertions, 14 deletions
diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml index 69ec41598..74eb8eae9 100644 --- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml @@ -78,7 +78,7 @@ Viewport { ClearBuffers { buffers: ClearBuffers.ColorDepthBuffer RenderPassFilter { - includes: FilterKey { name: "pass"; value: "material" } + matchAny: FilterKey { name: "pass"; value: "material" } } } } @@ -113,7 +113,7 @@ Viewport { LayerFilter { layers: "content" RenderPassFilter { - includes: FilterKey { name: "pass"; value: "stencilFill"; } + matchAny: FilterKey { name: "pass"; value: "stencilFill"; } } } } @@ -126,7 +126,7 @@ Viewport { LayerFilter { layers: "caps" RenderPassFilter { - includes: FilterKey { name: "pass"; value: "capping"; } + matchAny: FilterKey { name: "pass"; value: "capping"; } } } diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp index 394d30f7b..2bfac45ec 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp +++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp @@ -80,7 +80,7 @@ void DeferredRenderer::setGBuffer(Qt3DRender::QRenderTarget *gBuffer) void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria) { Q_FOREACH (Qt3DRender::QFilterKey *c, criteria) - m_geometryPassFilter->addInclude(c); + m_geometryPassFilter->addMatch(c); } void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria) diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index 8b7d35009..aa0d6f78f 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -69,7 +69,7 @@ Viewport { RenderPassFilter { id : geometryPass - includes : FilterKey { name : "pass"; value : "geometry" } + matchAny : FilterKey { name : "pass"; value : "geometry" } CameraSelector { id : sceneCameraSelector @@ -87,7 +87,7 @@ Viewport { RenderPassFilter { id : finalPass - includes : FilterKey { name : "pass"; value : "final" } + matchAny : FilterKey { name : "pass"; value : "final" } CameraSelector { camera: sceneCameraSelector.camera } diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index 21a44bae8..fed96964a 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -66,7 +66,7 @@ RenderSettings { matchAll: [ FilterKey { name: "name"; value: "Desktop" } ] RenderPassFilter { - includes: [ FilterKey { name: "pass"; value: "shadowmap" } ] + matchAny: [ FilterKey { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -106,7 +106,7 @@ RenderSettings { } RenderPassFilter { - includes: [ FilterKey { name: "pass"; value: "forward" } ] + matchAny: [ FilterKey { name: "pass"; value: "forward" } ] ClearBuffers { buffers: ClearBuffers.ColorDepthBuffer diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index 0956d485c..8fe6bf343 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -87,9 +87,8 @@ TechniqueFilter { LayerFilter { id: layerFilter - RenderPassFilter { includes: [ - FilterKey {name : "Name"; value : "Texture"} - ] } + RenderPassFilter { + matchAny: [ FilterKey {name : "Name"; value : "Texture"; } ] } } } } @@ -102,7 +101,7 @@ TechniqueFilter { CameraSelector { id: detailCameraSelector RenderPassFilter { - includes: [ FilterKey { name: "Name"; value: "ColorMaterial"; } ] + matchAny: [ FilterKey { name: "Name"; value: "ColorMaterial"; } ] } } } diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 893688cda..068c93764 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -68,7 +68,7 @@ RenderSettings { RenderSurfaceSelector { RenderPassFilter { - includes: [ FilterKey { name: "pass"; value: "shadowmap" } ] + matchAny: [ FilterKey { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -106,7 +106,7 @@ RenderSettings { } RenderPassFilter { - includes: [ FilterKey { name: "pass"; value: "forward" } ] + matchAny: [ FilterKey { name: "pass"; value: "forward" } ] ClearBuffers { buffers: ClearBuffers.ColorDepthBuffer |