Updated examples to use ClearBuffer

Change-Id: I2ef4c1b78b973b8a0e0df1452b398b96d5b8366b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

9 files changed, 127 insertions, 89 deletions

diff --git a/examples/assimp/main.qml b/examples/assimp/main.qml
index 22ef28997..1f2a7db21 100644
--- a/examples/assimp/main.qml
+++ b/examples/assimp/main.qml
@@ -48,29 +48,32 @@ Entity
     components: FrameGraph {
         activeFrameGraph: Viewport {
             rect: Qt.rect(0, 0, 1, 1)
-            CameraSelector {
-                camera: Entity {
-                    id : camera
-                    components : [
-                        Transform {
-                            LookAt {
-                                position: Qt.vector3d( 0.0, 0.0, -20.0 )
-                                upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
-                                viewCenter: Qt.vector3d( 0.0, 0.0, 10.0 )
+            ClearBuffer {
+                buffers : ClearBuffer.ColorDepthBuffer
+                CameraSelector {
+                    camera: Entity {
+                        id : camera
+                        components : [
+                            Transform {
+                                LookAt {
+                                    position: Qt.vector3d( 0.0, 0.0, -20.0 )
+                                    upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
+                                    viewCenter: Qt.vector3d( 0.0, 0.0, 10.0 )
+                                }
+                                Rotate {
+                                    angle : -30
+                                    axis : Qt.vector3d(0, 1, 0)
+                                }
+                            },
+                            CameraLens {
+                                projectionType: CameraLens.PerspectiveProjection
+                                fieldOfView: 60
+                                aspectRatio: 16/9
+                                nearPlane : 0.01
+                                farPlane : 1000.0
                             }
-                            Rotate {
-                                angle : -30
-                                axis : Qt.vector3d(0, 1, 0)
-                            }
-                        },
-                        CameraLens {
-                            projectionType: CameraLens.PerspectiveProjection
-                            fieldOfView: 60
-                            aspectRatio: 16/9
-                            nearPlane : 0.01
-                            farPlane : 1000.0
-                        }
-                    ]
+                        ]
+                    }
                 }
             }
         }
diff --git a/examples/bigmodel-qml/ForwardRenderer.qml b/examples/bigmodel-qml/ForwardRenderer.qml
index 3e10826ca..e2d1537b3 100644
--- a/examples/bigmodel-qml/ForwardRenderer.qml
+++ b/examples/bigmodel-qml/ForwardRenderer.qml
@@ -63,8 +63,11 @@ TechniqueFilter {
         id: viewport
         rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
 
-        CameraSelector {
-            id : cameraSelector
+        ClearBuffer {
+            buffers : ClearBuffer.ColorDepthBuffer
+            CameraSelector {
+                id : cameraSelector
+            }
         }
     }
 }
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp
index c18485c60..0e4c15df7 100644
--- a/examples/cpp_example/main.cpp
+++ b/examples/cpp_example/main.cpp
@@ -69,6 +69,7 @@
 #include <Qt3DRenderer/qviewport.h>
 #include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DRenderer/qframegraph.h>
+#include <Qt3DRenderer/qclearbuffer.h>
 
 int main(int ac, char **av)
 {
@@ -141,11 +142,14 @@ int main(int ac, char **av)
     Qt3D::QCameraSelector *cameraSelector = new Qt3D::QCameraSelector();
     Qt3D::QRenderPassFilter *defaultRenderPassFilter = new Qt3D::QRenderPassFilter();
     Qt3D::QViewport *viewport = new Qt3D::QViewport();
+    Qt3D::QClearBuffer *clearBuffer = new Qt3D::QClearBuffer();
 
     // TechiqueFilter and renderPassFilter are not implement yet
 
     viewport->setRect(QRectF(0, 0, 1, 1));
-    viewport->addChild(cameraSelector);
+    viewport->addChild(clearBuffer);
+    clearBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    clearBuffer->addChild(cameraSelector);
     cameraSelector->setCamera(cameraEntity);
     cameraSelector->addChild(defaultRenderPassFilter);
     techniqueFilter->addChild(viewport);
diff --git a/examples/deferred-renderer/DeferredRenderer.qml b/examples/deferred-renderer/DeferredRenderer.qml
index 0ffbbf963..559c2ee53 100644
--- a/examples/deferred-renderer/DeferredRenderer.qml
+++ b/examples/deferred-renderer/DeferredRenderer.qml
@@ -54,12 +54,16 @@ Viewport {
         RenderTargetSelector {
             id : gBufferTargetSelector
 
-            RenderPassFilter {
-                id : geometryPass
-                criteria : Criterion { name : "pass"; value : "geometry" }
+            ClearBuffer {
+                buffers: ClearBuffer.ColorDepthBuffer
+
+                RenderPassFilter {
+                    id : geometryPass
+                    criteria : Criterion { name : "pass"; value : "geometry" }
 
-                CameraSelector {
-                    id : sceneCameraSelector
+                    CameraSelector {
+                        id : sceneCameraSelector
+                    }
                 }
             }
         }
@@ -67,9 +71,15 @@ Viewport {
 
     LayerFilter {
         layers : "screenQuad"
-        RenderPassFilter {
-            id : finalPass
-            criteria : Criterion { name : "pass"; value : "final" }
+
+        ClearBuffer {
+            buffers: ClearBuffer.ColorDepthBuffer
+
+            RenderPassFilter {
+                id : finalPass
+                criteria : Criterion { name : "pass"; value : "final" }
+            }
+
         }
     }
 }
diff --git a/examples/multiviewport/main.qml b/examples/multiviewport/main.qml
index 7e2b903f9..c570df8d8 100644
--- a/examples/multiviewport/main.qml
+++ b/examples/multiviewport/main.qml
@@ -90,29 +90,32 @@ Entity {
                 id : mainViewport
                 rect: Qt.rect(0, 0, 1, 1)
 
+                ClearBuffer {
+                    buffers : ClearBuffer.ColorDepthBuffer
 
-                Viewport {
-                    id : topLeftViewport
-                    rect : Qt.rect(0, 0, 0.5, 0.5)
-                    CameraSelector {id : cameraSelectorTopLeftViewport; camera : sceneRoot.cameras[0]}
-                }
+                    Viewport {
+                        id : topLeftViewport
+                        rect : Qt.rect(0, 0, 0.5, 0.5)
+                        CameraSelector {id : cameraSelectorTopLeftViewport; camera : sceneRoot.cameras[0]}
+                    }
 
-                Viewport {
-                    id : topRightViewport
-                    rect : Qt.rect(0.5, 0, 0.5, 0.5)
-                    CameraSelector {id : cameraSelectorTopRightViewport;camera : sceneRoot.cameras[1]}
-                }
+                    Viewport {
+                        id : topRightViewport
+                        rect : Qt.rect(0.5, 0, 0.5, 0.5)
+                        CameraSelector {id : cameraSelectorTopRightViewport;camera : sceneRoot.cameras[1]}
+                    }
 
-                Viewport {
-                    id : bottomLeftViewport
-                    rect : Qt.rect(0, 0.5, 0.5, 0.5)
-                    CameraSelector {id : cameraSelectorBottomLeftViewport; camera : sceneRoot.cameras[2]}
-                }
+                    Viewport {
+                        id : bottomLeftViewport
+                        rect : Qt.rect(0, 0.5, 0.5, 0.5)
+                        CameraSelector {id : cameraSelectorBottomLeftViewport; camera : sceneRoot.cameras[2]}
+                    }
 
-                Viewport {
-                    id : bottomRightViewport
-                    rect : Qt.rect(0.5, 0.5, 0.5, 0.5)
-                    CameraSelector {id : cameraSelectorBottomRightViewport; camera : sceneRoot.cameras[3]}
+                    Viewport {
+                        id : bottomRightViewport
+                        rect : Qt.rect(0.5, 0.5, 0.5, 0.5)
+                        CameraSelector {id : cameraSelectorBottomRightViewport; camera : sceneRoot.cameras[3]}
+                    }
                 }
             } // mainViewport
         } // frameGraph
diff --git a/examples/rollerball/ForwardRenderer.qml b/examples/rollerball/ForwardRenderer.qml
index b7ca934e0..7a100bf4d 100644
--- a/examples/rollerball/ForwardRenderer.qml
+++ b/examples/rollerball/ForwardRenderer.qml
@@ -62,6 +62,9 @@ TechniqueFilter {
         CameraSelector {
             id : cameraSelector
             objectName : "cameraSelector"
+            ClearBuffer {
+                buffers : ClearBuffer.ColorDepthBuffer
+            }
         }
     }
 }
diff --git a/examples/simple-qml/ForwardRenderer.qml b/examples/simple-qml/ForwardRenderer.qml
index f12d20725..04568cb1d 100644
--- a/examples/simple-qml/ForwardRenderer.qml
+++ b/examples/simple-qml/ForwardRenderer.qml
@@ -66,48 +66,52 @@ TechniqueFilter {
         Criterion { name : "Enabled"; value : true;}
     ]
 
-    Viewport {
-        id: viewport
-        objectName : "viewport"
-        rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
+    ClearBuffer {
+        buffers : ClearBuffer.ColorDepthBuffer
 
         Viewport {
-            id : top_right_viewport
-            rect: Qt.rect(0.5, 0, 0.5, 0.5)
-            objectName : "topRightViewport"
-            CameraSelector {
-                id : cameraSelectorTopRight
-                objectName : "cameraSelector"
-                LayerFilter {
-                    id : layerFilter
-                    objectName : "layerFilter"
-                    RenderPassFilter { criteria : [Criterion {name : "Name"; value : "TextureLighting";}] }
+            id: viewport
+            objectName : "viewport"
+            rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
+
+            Viewport {
+                id : top_right_viewport
+                rect: Qt.rect(0.5, 0, 0.5, 0.5)
+                objectName : "topRightViewport"
+                CameraSelector {
+                    id : cameraSelectorTopRight
+                    objectName : "cameraSelector"
+                    LayerFilter {
+                        id : layerFilter
+                        objectName : "layerFilter"
+                        RenderPassFilter { criteria : [Criterion {name : "Name"; value : "TextureLighting";}] }
+                    }
                 }
             }
         }
+    }
 
-        Viewport {
-            id : bottom_left_viewport
-            objectName : "bottomLeftViewport"
-            rect: Qt.rect(0.0, 0.5, 0.5, 0.5)
-            CameraSelector {
-                id: cameraSelectorBottomLeft
-                objectName : "cameraSelector"
-                RenderTargetSelector {
-                    target : RenderTarget {
-                        attachments : [
-                            RenderAttachment {
-                                id : defaultColorAttachment
-                                type : RenderAttachment.ColorAttachment0
-                                name : "diffuse"
-                            }
-                        ]
-                    }
-                    RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Texture";}] }
-                    RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Lighting";}] }
+    Viewport {
+        id : bottom_left_viewport
+        objectName : "bottomLeftViewport"
+        rect: Qt.rect(0.0, 0.5, 0.5, 0.5)
+        CameraSelector {
+            id: cameraSelectorBottomLeft
+            objectName : "cameraSelector"
+            RenderTargetSelector {
+                target : RenderTarget {
+                    attachments : [
+                        RenderAttachment {
+                            id : defaultColorAttachment
+                            type : RenderAttachment.ColorAttachment0
+                            name : "diffuse"
+                        }
+                    ]
                 }
-                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Final";}] }
+                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Texture";}] }
+                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Lighting";}] }
             }
+            RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Final";}] }
         }
     }
 }
diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp
index 7a99ee40f..230810156 100644
--- a/examples/torus-cpp/main.cpp
+++ b/examples/torus-cpp/main.cpp
@@ -66,6 +66,7 @@
 #include <Qt3DRenderer/qviewport.h>
 #include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DRenderer/qframegraph.h>
+#include <Qt3DRenderer/qclearbuffer.h>
 
 int main(int argc, char **argv)
 {
@@ -99,14 +100,18 @@ int main(int argc, char **argv)
     Qt3D::QCameraSelector *cameraSelector = new Qt3D::QCameraSelector();
     Qt3D::QRenderPassFilter *defaultRenderPassFilter = new Qt3D::QRenderPassFilter();
     Qt3D::QViewport *viewport = new Qt3D::QViewport();
+    Qt3D::QClearBuffer *clearBuffer = new Qt3D::QClearBuffer();
 
     // TechiqueFilter and renderPassFilter are not implement yet
 
     viewport->setRect(QRectF(0, 0, 1, 1));
-    viewport->addChild(cameraSelector);
+    viewport->addChild(clearBuffer);
+    clearBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    clearBuffer->addChild(cameraSelector);
     cameraSelector->setCamera(cameraEntity);
     cameraSelector->addChild(defaultRenderPassFilter);
     techniqueFilter->addChild(viewport);
+
     frameGraph->setActiveFrameGraph(techniqueFilter);
 
 
diff --git a/examples/torus-qml/ForwardRenderer.qml b/examples/torus-qml/ForwardRenderer.qml
index 3e10826ca..e2d1537b3 100644
--- a/examples/torus-qml/ForwardRenderer.qml
+++ b/examples/torus-qml/ForwardRenderer.qml
@@ -63,8 +63,11 @@ TechniqueFilter {
         id: viewport
         rect: Qt.rect(0.0, 0.0, 1.0, 1.0) // From Top Left
 
-        CameraSelector {
-            id : cameraSelector
+        ClearBuffer {
+            buffers : ClearBuffer.ColorDepthBuffer
+            CameraSelector {
+                id : cameraSelector
+            }
         }
     }
 }