From f837692f5b8579125335624ea7228a4edb5897b5 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Wed, 16 Mar 2016 22:41:28 +0000 Subject: Rename QClearBuffer to QClearBuffers Task-number: QTBUG-51460 Change-Id: I3f522f5eaea7bf0f94dbcdc1e7463f2827c0fe3b Reviewed-by: Sean Harmer --- examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml | 8 ++++---- examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml | 8 ++++---- examples/qt3d/compute-particles/ComputeFrameGraph.qml | 4 ++-- examples/qt3d/cpp_example/main.cpp | 2 +- examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp | 8 ++++---- examples/qt3d/deferred-renderer-cpp/deferredrenderer.h | 6 +++--- examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml | 8 ++++---- examples/qt3d/enabled-qml/main.qml | 4 ++-- examples/qt3d/gltf/main.qml | 4 ++-- examples/qt3d/materials/SortedForwardRenderer.qml | 4 ++-- examples/qt3d/multiviewport/QuadViewportFrameGraph.qml | 4 ++-- examples/qt3d/picking-qml/main.qml | 4 ++-- examples/qt3d/planets-qml/PlanetFrameGraph.qml | 8 ++++---- examples/qt3d/playground-qml/MyForwardRenderer.qml | 4 ++-- examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml | 8 ++++---- examples/qt3d/wave/WaveForwardRenderer.qml | 4 ++-- 16 files changed, 44 insertions(+), 44 deletions(-) (limited to 'examples/qt3d') diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml index f48a066b9..ebe4bbadd 100644 --- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml +++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml @@ -62,8 +62,8 @@ Viewport { // ColorMask is reset by default // By default reset to the default if not specified - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer NoDraw {} // We just want to clear the buffers } @@ -79,8 +79,8 @@ Viewport { } // Draw with right eye - ClearBuffer { - buffers: ClearBuffer.DepthBuffer + ClearBuffers { + buffers: ClearBuffers.DepthBuffer CameraSelector { id: rightCameraSelector RenderStateSet { diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml index 50b9e4102..69ec41598 100644 --- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml @@ -75,8 +75,8 @@ Viewport { // Render entities with their regular material // Fills depth buffer for entities that are clipped layers: ["content", "visualization"] - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer RenderPassFilter { includes: FilterKey { name: "pass"; value: "material" } } @@ -84,9 +84,9 @@ Viewport { } // Branch 2 - ClearBuffer { + ClearBuffers { // Enable and fill Stencil to later generate caps - buffers: ClearBuffer.StencilBuffer + buffers: ClearBuffers.StencilBuffer RenderStateSet { // Disable depth culling // Incr for back faces diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml index 0cd43f6d2..9a84f246f 100644 --- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml +++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml @@ -58,8 +58,8 @@ Viewport { id: surfaceSelector // Clear Buffer - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer NoDraw {} } diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp index 575be946a..e93c417ee 100644 --- a/examples/qt3d/cpp_example/main.cpp +++ b/examples/qt3d/cpp_example/main.cpp @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include "qt3dwindow.h" #include "qfirstpersoncameracontroller.h" diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp index 5981de9ed..394d30f7b 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp +++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp @@ -56,15 +56,15 @@ DeferredRenderer::DeferredRenderer(Qt3DCore::QNode *parent) , m_surfaceSelector(new Qt3DRender::QRenderSurfaceSelector(this)) , m_sceneFilter(new Qt3DRender::QLayerFilter(m_surfaceSelector)) , m_screenQuadFilter(new Qt3DRender::QLayerFilter(m_surfaceSelector)) - , m_clearScreenQuad(new Qt3DRender::QClearBuffer(m_screenQuadFilter)) + , m_clearScreenQuad(new Qt3DRender::QClearBuffers(m_screenQuadFilter)) , m_gBufferTargetSelector(new Qt3DRender::QRenderTargetSelector(m_sceneFilter)) - , m_clearGBuffer(new Qt3DRender::QClearBuffer(m_gBufferTargetSelector)) + , m_clearGBuffer(new Qt3DRender::QClearBuffers(m_gBufferTargetSelector)) , m_geometryPassFilter(new Qt3DRender::QRenderPassFilter(m_clearGBuffer)) , m_finalPassFilter(new Qt3DRender::QRenderPassFilter(m_clearScreenQuad)) , m_sceneCameraSelector(new Qt3DRender::QCameraSelector(m_geometryPassFilter)) { - m_clearGBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer); - m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer); + m_clearGBuffer->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer); + m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffers::ColorDepthBuffer); } void DeferredRenderer::setSceneCamera(Qt3DCore::QEntity *camera) diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h index 8f37d4b5a..fa716ee7d 100644 --- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h +++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h @@ -52,7 +52,7 @@ #define DEFERREDRENDERER_H #include -#include +#include #include #include #include @@ -76,9 +76,9 @@ private: Qt3DRender::QRenderSurfaceSelector *m_surfaceSelector; Qt3DRender::QLayerFilter *m_sceneFilter; Qt3DRender::QLayerFilter *m_screenQuadFilter; - Qt3DRender::QClearBuffer *m_clearScreenQuad; + Qt3DRender::QClearBuffers *m_clearScreenQuad; Qt3DRender::QRenderTargetSelector *m_gBufferTargetSelector; - Qt3DRender::QClearBuffer *m_clearGBuffer; + Qt3DRender::QClearBuffers *m_clearGBuffer; Qt3DRender::QRenderPassFilter *m_geometryPassFilter; Qt3DRender::QRenderPassFilter *m_finalPassFilter; Qt3DRender::QCameraSelector *m_sceneCameraSelector; diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index 6b87d468f..8b7d35009 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -64,8 +64,8 @@ Viewport { RenderTargetSelector { id : gBufferTargetSelector - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer RenderPassFilter { id : geometryPass @@ -82,8 +82,8 @@ Viewport { LayerFilter { layers : "screenQuad" - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer RenderPassFilter { id : finalPass diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index e48f53a47..84c420afc 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -65,8 +65,8 @@ Entity { RenderSurfaceSelector { - ClearBuffer { - buffers : ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers : ClearBuffers.ColorDepthBuffer enabled: counter !== 6 } diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml index 3d4cc4f4e..5d34890ea 100644 --- a/examples/qt3d/gltf/main.qml +++ b/examples/qt3d/gltf/main.qml @@ -75,8 +75,8 @@ Entity { clearColor: "black" CameraSelector { camera: camera - ClearBuffer { - buffers : ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers : ClearBuffers.ColorDepthBuffer SortPolicy { criteria: [ SortCriterion { sort: SortCriterion.BackToFront } diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index ba2922e90..6b42d28ea 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -76,8 +76,8 @@ TechniqueFilter { CameraSelector { id : cameraSelector objectName : "cameraSelector" - ClearBuffer { - buffers : ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers : ClearBuffers.ColorDepthBuffer SortPolicy { criteria: [ SortCriterion { sort: SortCriterion.StateChangeCost }, diff --git a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml index a6cd2bc21..2fb8474ad 100644 --- a/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml +++ b/examples/qt3d/multiviewport/QuadViewportFrameGraph.qml @@ -67,8 +67,8 @@ RenderSettings { id: mainViewport normalizedRect: Qt.rect(0, 0, 1, 1) - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer } Viewport { diff --git a/examples/qt3d/picking-qml/main.qml b/examples/qt3d/picking-qml/main.qml index e0b446449..bc0bf82ba 100644 --- a/examples/qt3d/picking-qml/main.qml +++ b/examples/qt3d/picking-qml/main.qml @@ -95,8 +95,8 @@ Entity { normalizedRect: Qt.rect(0.0, 0.0, 1.0, 1.0) RenderSurfaceSelector { - ClearBuffer { - buffers : ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers : ClearBuffers.ColorDepthBuffer NoDraw {} } diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index d575637d4..267cc6036 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -95,8 +95,8 @@ RenderSettings { ] } - ClearBuffer { - buffers: ClearBuffer.DepthBuffer + ClearBuffers { + buffers: ClearBuffers.DepthBuffer CameraSelector { id: lightCameraSelector @@ -109,8 +109,8 @@ RenderSettings { RenderPassFilter { includes: [ FilterKey { name: "pass"; value: "forward" } ] - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer CameraSelector { id: viewCameraSelector diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index ccbdc8536..3be14e0e4 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -73,8 +73,8 @@ TechniqueFilter { FilterKey { name: "Enabled"; value: true;} ] - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer // Main Viewport Viewport { diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 2a510b40b..302b10af5 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -92,8 +92,8 @@ RenderSettings { ] } - ClearBuffer { - buffers: ClearBuffer.DepthBuffer + ClearBuffers { + buffers: ClearBuffers.DepthBuffer CameraSelector { id: lightCameraSelector @@ -105,8 +105,8 @@ RenderSettings { RenderPassFilter { includes: [ FilterKey { name: "pass"; value: "forward" } ] - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer CameraSelector { id: viewCameraSelector diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index 660633c23..bee266efd 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.qml @@ -73,8 +73,8 @@ TechniqueFilter { CameraSelector { id: cameraSelector - ClearBuffer { - buffers: ClearBuffer.ColorDepthBuffer + ClearBuffers { + buffers: ClearBuffers.ColorDepthBuffer LayerFilter { layers: "background" } } -- cgit v1.2.3