diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-06-05 07:39:35 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-06-05 07:39:35 +0200 |
| commit | fadf8879ed3616b745aee76d3c833f88d3c84f22 (patch) | |
| tree | 46b37179034d9635c7dd6e9d8634872ad64f3ba0 | |
| parent | 96dbfb9d9d239d9fe957d8b8a889a708e83014d1 (diff) | |
Work with latest declarative
| -rw-r--r-- | examples/animatedbackground/BackgroundSwirls.qml | 5 | ||||
| -rw-r--r-- | examples/animatedbackground/Swirl.qml | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/examples/animatedbackground/BackgroundSwirls.qml b/examples/animatedbackground/BackgroundSwirls.qml index cc91833..c1c4dde 100644 --- a/examples/animatedbackground/BackgroundSwirls.qml +++ b/examples/animatedbackground/BackgroundSwirls.qml @@ -102,12 +102,11 @@ Item { system: particles emitRate: Math.sqrt(parent.width * parent.height) / 30 lifeSpan: 2000 - emitting: true size: 4 sizeVariation: 2 - acceleration: AngledDirection { angle: 90; angleVariation: 360; magnitude: 20; } - speed: AngledDirection { angle: -90; angleVariation: 360; magnitude: 10; } + acceleration: AngleDirection { angle: 90; angleVariation: 360; magnitude: 20; } + speed: AngleDirection { angle: -90; angleVariation: 360; magnitude: 10; } } diff --git a/examples/animatedbackground/Swirl.qml b/examples/animatedbackground/Swirl.qml index 51f039b..56d8331 100644 --- a/examples/animatedbackground/Swirl.qml +++ b/examples/animatedbackground/Swirl.qml @@ -36,7 +36,7 @@ import QtQuick 2.0 -ShaderEffectItem { +ShaderEffect { id: shader width: 400 @@ -79,7 +79,7 @@ ShaderEffectItem { uniform highp float tz; uniform highp float tw; uniform highp float amplitude; - uniform highp mat4 qt_ModelViewProjectionMatrix; + uniform highp mat4 qt_Matrix; attribute highp vec4 qt_Vertex; attribute highp vec2 qt_MultiTexCoord0; varying highp vec2 qt_TexCoord0; @@ -92,7 +92,7 @@ ShaderEffectItem { pos.y += mix(y1, y2, qt_MultiTexCoord0.y) * amplitude * 0.5; - gl_Position = qt_ModelViewProjectionMatrix * pos; + gl_Position = qt_Matrix * pos; qt_TexCoord0 = qt_MultiTexCoord0; } " |