diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-09 10:16:16 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-01-18 15:30:49 +0100 |
| commit | 1cbb5868e80a09bed4ad486eba638c9bd66ce4b2 (patch) | |
| tree | 3556f308aa4d4bc747a1ba4c15af0851e744fdf1 | |
| parent | 074263ba87e73c67e355ee5dc5037477090f6957 (diff) | |
playground-qml updated to test new cases with QShaderData
Change-Id: I2678c7022461b578776854d00a508657b2c29f9b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/playground-qml/AnimatedDiffuseMaterial.qml | 49 | ||||
| -rw-r--r-- | examples/playground-qml/MainView.qml | 4 |
2 files changed, 35 insertions, 18 deletions
diff --git a/examples/playground-qml/AnimatedDiffuseMaterial.qml b/examples/playground-qml/AnimatedDiffuseMaterial.qml index b019fdf57..597e321ee 100644 --- a/examples/playground-qml/AnimatedDiffuseMaterial.qml +++ b/examples/playground-qml/AnimatedDiffuseMaterial.qml @@ -51,11 +51,32 @@ Material { property bool enabled: true property Texture2D texture; + QQ2.Timer { + id: testTimer + interval: 5000 + repeat: true + running: true + property bool even: true + onTriggered: { + console.log("Triggered"); + even = !even + pointLightBlockShaderData.u.values[0].t = (even) ? null : shaderDataT + } + } + + ShaderData { + id: shaderDataT + property real a: testTimer.even ? 1.0 : 0.0 + property real b: 5.0 + property var r: [Qt.vector3d(1, 1, 1), Qt.vector3d(2, 2, 2), Qt.vector3d(3, 3, 3), Qt.vector3d(4, 4, 4)] + } + parameters: [ Parameter { name: "ambient"; value: Qt.vector3d(material.ambientColor.r, material.ambientColor.g, material.ambientColor.b) }, Parameter { name: "lightIntensity"; value: Qt.vector3d(0.5, 0.5, 0.5)}, Parameter { name: "texture"; value: texture}, Parameter { name: "PointLightBlock"; value: ShaderData { + id: pointLightBlockShaderData property color colorAmbient; property color colorDiffuse; property color colorSpecular; @@ -74,23 +95,19 @@ Material { property real innerV: 2.0 property vector3d innerVec3 property var innerVec3Array: [Qt.vector3d(1, 1, 1), Qt.vector3d(2, 2, 2), Qt.vector3d(3, 3, 3), Qt.vector3d(4, 4, 4)] - property ShaderData t: ShaderData { - property real a: 1.0 - property real b: 5.0 - property var r: [Qt.vector3d(1, 1, 1), Qt.vector3d(2, 2, 2), Qt.vector3d(3, 3, 3), Qt.vector3d(4, 4, 4)] - } - property ShaderDataArray c: ShaderDataArray { - ShaderData { - property real a: 3.0 - property real b: 4.0 - property var r: [Qt.vector3d(1, 1, 1), Qt.vector3d(2, 2, 2), Qt.vector3d(3, 3, 3), Qt.vector3d(4, 4, 4)] - } - ShaderData { - property real a: 2.0 - property real b: 3.0 - property var r: [Qt.vector3d(2, 2, 2), Qt.vector3d(1, 1, 1), Qt.vector3d(4, 4, 4), Qt.vector3d(3, 3, 3)] + property ShaderData t: shaderDataT + property ShaderDataArray c: ShaderDataArray { + ShaderData { + property real a: 3.0 + property real b: 4.0 + property var r: [Qt.vector3d(1, 1, 1), Qt.vector3d(2, 2, 2), Qt.vector3d(3, 3, 3), Qt.vector3d(4, 4, 4)] + } + ShaderData { + property real a: 2.0 + property real b: 3.0 + property var r: [Qt.vector3d(2, 2, 2), Qt.vector3d(1, 1, 1), Qt.vector3d(4, 4, 4), Qt.vector3d(3, 3, 3)] + } } - } } ShaderData { property real innerV: 3.2 diff --git a/examples/playground-qml/MainView.qml b/examples/playground-qml/MainView.qml index 8996b187e..ca6cd2f86 100644 --- a/examples/playground-qml/MainView.qml +++ b/examples/playground-qml/MainView.qml @@ -61,13 +61,13 @@ Entity { Mesh { id: ballMesh objectName: "ballMesh" - source: ":/assets/ball.obj" + source: "assets/ball.obj" } Mesh { id: cubeMesh objectName: "cubeMesh" - source: ":/assets/cube.obj" + source: "assets/cube.obj" } AnimatedDiffuseMaterial { |