diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-05-06 08:48:50 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-06 08:10:22 +0000 |
commit | cd78eba29314415c28bded4ded9db783480cd004 (patch) | |
tree | d2c6ffffdedc986db7317f4f2d2f22400d2ee1fe | |
parent | 81020db255f0d35289ccc62370bcd60e829ddd0f (diff) |
Port missing examples to the new Layer(Filter) API
Note that the deferred-renderer-qml example never worked for me
so I can't completely confirm if it is repaired or not.
Change-Id: I8d39e69b755b25cc018dbefc22244af9bb621735
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml | 11 | ||||
-rw-r--r-- | examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml | 5 | ||||
-rw-r--r-- | examples/qt3d/clip-planes-qml/ClippingPlanes.qml | 12 | ||||
-rw-r--r-- | examples/qt3d/clip-planes-qml/main.qml | 9 | ||||
-rw-r--r-- | examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml | 8 | ||||
-rw-r--r-- | examples/qt3d/deferred-renderer-qml/main.qml | 59 | ||||
-rw-r--r-- | examples/qt3d/enabled-qml/main.qml | 8 | ||||
-rw-r--r-- | examples/qt3d/picking-qml/PickableEntity.qml | 6 | ||||
-rw-r--r-- | examples/qt3d/picking-qml/main.qml | 13 |
9 files changed, 67 insertions, 64 deletions
diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml index 5af9be195..d1316ab66 100644 --- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml @@ -52,10 +52,15 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 Viewport { + id: root property alias camera: cameraSelector.camera property alias window: surfaceSelector.surface property alias clearColor: clearBuffer.clearColor + readonly property Layer contentLayer: Layer {} + readonly property Layer visualizationLayer: Layer {} + readonly property Layer capsLayer: Layer {} + RenderSurfaceSelector { id: surfaceSelector @@ -75,7 +80,7 @@ Viewport { LayerFilter { // Render entities with their regular material // Fills depth buffer for entities that are clipped - layers: ["content", "visualization"] + layers: [root.contentLayer, root.visualizationLayer] ClearBuffers { id: clearBuffer buffers: ClearBuffers.ColorDepthBuffer @@ -113,7 +118,7 @@ Viewport { ] LayerFilter { - layers: "content" + layers: root.contentLayer RenderPassFilter { matchAny: FilterKey { name: "pass"; value: "stencilFill"; } } @@ -126,7 +131,7 @@ Viewport { RenderStateSet { // Draw caps using stencil buffer LayerFilter { - layers: "caps" + layers: root.capsLayer RenderPassFilter { matchAny: FilterKey { name: "pass"; value: "capping"; } } diff --git a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml index e70177c6d..4bd2028b6 100644 --- a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml +++ b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml @@ -54,6 +54,7 @@ import Qt3D.Extras 2.0 Entity { id: root + property Layer layer property Material visualMaterial; property real rotateAngle: 0.0 property vector3d rotateAxis: Qt.vector3d(1.0, 0.0, 0.0) @@ -79,10 +80,6 @@ Entity { rotation: fromAxisAndAngle(root.rotateAxis, root.rotateAngle) } - property Layer layer: Layer { - names: "visualization" - } - components: [visualMaterial, mesh, transform, layer] } diff --git a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml index c1dd905f3..62deabc73 100644 --- a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml +++ b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml @@ -55,6 +55,9 @@ import Qt3D.Extras 2.0 Entity { id: root + property Layer capsLayer + property Layer visualizationLayer + property ShaderData sectionData: ShaderData { property real sectionsCount: 3 property ShaderDataArray sections: ShaderDataArray { @@ -74,10 +77,6 @@ Entity { } Entity { - property Layer layer: Layer { - names: "caps" - } - property Material cappingMaterial: Material { effect: CappingMaterialEffect { sectionsData: root.sectionData @@ -90,7 +89,7 @@ Entity { meshResolution: Qt.size(2, 2) } - components: [cappingMaterial, mesh, layer] + components: [cappingMaterial, mesh, root.capsLayer] } PlaneVisualizationMaterial { @@ -101,6 +100,7 @@ Entity { // XZ ClipPlaneEntity { id: clipPlane0 + layer: root.visualizationLayer visualMaterial: clipPlanesMaterial center: Qt.vector3d(0, -10, 0) normal: Qt.vector3d(0, -1.0, 0) @@ -108,6 +108,7 @@ Entity { // XY ClipPlaneEntity { id: clipPlane1 + layer: root.visualizationLayer visualMaterial: clipPlanesMaterial center: Qt.vector3d(0, 0, 10) normal: Qt.vector3d(0, 0, -1.0) @@ -118,6 +119,7 @@ Entity { // YZ ClipPlaneEntity { id: clipPlane2 + layer: root.visualizationLayer visualMaterial: clipPlanesMaterial center: Qt.vector3d(-10, 0, 0) normal: Qt.vector3d(1.0, 0, 0) diff --git a/examples/qt3d/clip-planes-qml/main.qml b/examples/qt3d/clip-planes-qml/main.qml index 83557cbd6..4ab043285 100644 --- a/examples/qt3d/clip-planes-qml/main.qml +++ b/examples/qt3d/clip-planes-qml/main.qml @@ -74,6 +74,7 @@ Entity { components: [ RenderSettings { ClipCappingFrameGraph { + id: frameGraph camera: camera; clearColor: Qt.rgba(0.0, 0.5, 1, 1) } @@ -89,6 +90,8 @@ Entity { ClippingPlanes { id: clippingPlanes + visualizationLayer: frameGraph.visualizationLayer + capsLayer: frameGraph.contentLayer } // Entity being clipped @@ -112,10 +115,6 @@ Entity { scale: 3 } - property Layer layer: Layer { - names: "content" - } - - components: [material, transform, mesh, layer] + components: [material, transform, mesh, frameGraph.contentLayer] } } diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index aa0d6f78f..6f70d2d87 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -52,14 +52,18 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 Viewport { + id: root normalizedRect : Qt.rect(0.0, 0.0, 1.0, 1.0) property alias gBuffer : gBufferTargetSelector.target property alias camera : sceneCameraSelector.camera + readonly property Layer sceneLayer: Layer {} + readonly property Layer screenQuadLayer: Layer {} + RenderSurfaceSelector { LayerFilter { - layers : "scene" + layers : root.sceneLayer RenderTargetSelector { id : gBufferTargetSelector @@ -80,7 +84,7 @@ Viewport { } LayerFilter { - layers : "screenQuad" + layers : root.screenQuadLayer ClearBuffers { buffers: ClearBuffers.ColorDepthBuffer diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml index cca32ca3c..b56e0bd5d 100644 --- a/examples/qt3d/deferred-renderer-qml/main.qml +++ b/examples/qt3d/deferred-renderer-qml/main.qml @@ -64,6 +64,7 @@ Entity { components : [ RenderSettings { activeFrameGraph: DeferredRenderer { + id: frameGraph camera : camera gBuffer: gBuffer } @@ -77,29 +78,30 @@ Entity { Entity { id : screenQuadEntity - components : [ - Layer { - names : "screenQuad" - }, - PlaneMesh { - width: 2.0 - height: 2.0 - meshResolution: Qt.size(2, 2) - }, - Transform { // We rotate the plane so that it faces us - rotation: fromAxisAndAngle(Qt.vector3d(1, 0, 0), 90) - }, - Material { - parameters : [ - Parameter { name: "color"; value : gBuffer.color }, - Parameter { name: "position"; value : gBuffer.position }, - Parameter { name: "normal"; value : gBuffer.normal }, - Parameter { name: "winSize"; value : Qt.size(1024, 1024) } - ] - effect : FinalEffect {} - } - ] + PlaneMesh { + id: mesh + width: 2.0 + height: 2.0 + meshResolution: Qt.size(2, 2) + } + Transform { // We rotate the plane so that it faces us + id: transform + rotation: fromAxisAndAngle(Qt.vector3d(1, 0, 0), 90) + } + + Material { + id: material + parameters : [ + Parameter { name: "color"; value : gBuffer.color }, + Parameter { name: "position"; value : gBuffer.position }, + Parameter { name: "normal"; value : gBuffer.normal }, + Parameter { name: "winSize"; value : Qt.size(1024, 1024) } + ] + effect : FinalEffect {} + } + + components : [ frameGraph.screenQuadLayer, mesh, transform, material ] } Entity { @@ -126,11 +128,6 @@ Entity { viewCenter: Qt.vector3d( 0.0, 0.0, 10.0 ) } - Layer { - id : sceneLayer - names : "scene" - } - SphereMesh { id : sphereMesh rings: 50 @@ -172,7 +169,7 @@ Entity { material, sphere1.transform, sphere1.light, - sceneLayer + frameGraph.sceneLayer ] } @@ -198,7 +195,7 @@ Entity { sphere2.transform, material, sphere2.light, - sceneLayer + frameGraph.sceneLayer ] } @@ -232,7 +229,7 @@ Entity { material, light, transform, - sceneLayer + frameGraph.sceneLayer ] } @@ -249,7 +246,7 @@ Entity { components: [ light4.light, light4.transform, - sceneLayer + frameGraph.sceneLayer ] } } diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index 182d35ca8..8ee933eb6 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -77,7 +77,7 @@ Entity { LayerFilter { enabled: counter === 12 - layers: "scene" + layers: sceneLayer } } } @@ -125,9 +125,8 @@ Entity { } Layer { - id: layer + id: sceneLayer enabled: counter !== 2 - names: "scene" } Transform { @@ -180,7 +179,7 @@ Entity { } } - components: [sphereMesh, material, layer, transform] + components: [sphereMesh, material, sceneLayer, transform] } // Floor @@ -201,7 +200,6 @@ Entity { Layer { id: floorLayer - names: "floor" } components: [planeMesh, floorMaterial, floorLayer] diff --git a/examples/qt3d/picking-qml/PickableEntity.qml b/examples/qt3d/picking-qml/PickableEntity.qml index f3cdb790b..edc0327ee 100644 --- a/examples/qt3d/picking-qml/PickableEntity.qml +++ b/examples/qt3d/picking-qml/PickableEntity.qml @@ -60,6 +60,7 @@ Entity { signal entered() signal exited() + property Layer layer property real x: 0 property real y: 0 property real z: 0 @@ -88,11 +89,6 @@ Entity { translation: Qt.vector3d(x, y, z) } - Layer { - id: layer - names: "content" - } - components: [mesh, material, transform, objectPicker, layer] } diff --git a/examples/qt3d/picking-qml/main.qml b/examples/qt3d/picking-qml/main.qml index 64b79f819..8cd55a627 100644 --- a/examples/qt3d/picking-qml/main.qml +++ b/examples/qt3d/picking-qml/main.qml @@ -60,6 +60,9 @@ import QtQuick.Scene3D 2.0 Entity { id: sceneRoot + property Layer contentLayer: Layer {} + property Layer debugLayer: Layer {} + Camera { id: camera projectionType: CameraLens.PerspectiveProjection @@ -105,7 +108,7 @@ Entity { normalizedRect: Qt.rect(0.0, 0.0, 0.5, 1.0) CameraSelector { camera: camera - LayerFilter { layers: "content"} + LayerFilter { layers: sceneRoot.contentLayer } } } @@ -115,7 +118,7 @@ Entity { camera: camera2 LayerFilter { // To show Debug volumes - layers: ["content", "debug"] + layers: [sceneRoot.contentLayer, sceneRoot.debugLayer] } } } @@ -132,6 +135,7 @@ Entity { property real scaleFactor: isPressed ? 3.0 : 1.0 QQ2.Behavior on scaleFactor { QQ2.NumberAnimation { duration: 150; easing.type: QQ2.Easing.InQuad } } + layer: sceneRoot.contentLayer mesh: cubeMesh scale: cube1.scaleFactor x: -8 @@ -149,6 +153,7 @@ Entity { PickableEntity { id: cube2 + layer: sceneRoot.contentLayer mesh: cubeMesh ambientColor: cube2.containsMouse ? "blue" : "red" @@ -166,6 +171,7 @@ Entity { } PickableEntity { id: cube3 + layer: sceneRoot.contentLayer mesh: cubeMesh diffuseColor: "yellow" @@ -204,10 +210,9 @@ Entity { scale: cube4.scaleFactor translation: Qt.vector3d(3, 4, 0) } - readonly property Layer layer: Layer { names: "content" } readonly property PhongMaterial material: PhongMaterial { diffuse: "red" } - components: [cubeMesh, transform, material, layer] + components: [cubeMesh, transform, material, sceneRoot.contentLayer] } } } |