summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/wave
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-03-01 09:06:18 +0000
committerRobert Brock <robert.brock@kdab.com>2016-03-08 15:59:07 +0000
commit02da4f2145aa5eeadbbd9b33ba739db1366dee1c (patch)
tree41ec95a13a8ff76c3fe65c68370adb8b14152b45 /examples/qt3d/wave
parent7284b37bf81b08530afcc141b3cf2f5358b735c1 (diff)
QTechnique renaming
annotations -> filterKeys addPass -> addRenderPass removePass -> removeRenderPass Change-Id: Ica1731ee3100b249e4fef04f45c0e6326732d644 Task-number: QTBUG-51458 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/wave')
-rw-r--r--examples/qt3d/wave/BackgroundEffect.qml2
-rw-r--r--examples/qt3d/wave/WaveEffect.qml4
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index a9442e976..587af815d 100644
--- a/examples/qt3d/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
@@ -63,7 +63,7 @@ Effect {
minorVersion: 1
}
- annotations: Annotation { name: "renderingStyle"; value: "forward" }
+ filterKeys: Annotation { name: "renderingStyle"; value: "forward" }
renderPasses: [
RenderPass {
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 463bc0cd2..9c3705c0c 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -78,9 +78,9 @@ Effect {
minorVersion: 2
}
- annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+ filterKeys: [ Annotation { name: "renderingStyle"; value: "forward" } ]
- parameters: [
+ uniforms: [
Parameter { name: "light.position"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
Parameter { name: "light.intensity"; value: Qt.vector3d( 1.0, 1.0, 1.0 ) },
Parameter { name: "line.width"; value: 0.8 },