diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-06-25 12:01:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 02:21:36 +0200 |
| commit | 5df94d89033e7bbb3f41840a4c07a628ed66b4d5 (patch) | |
| tree | e42bcd16d8f5f3a192c48794b610ffeb05b9dc02 /examples/quick | |
| parent | 2241d6fa2d39fe890ba0d17ff58b5e0615c1cd7b (diff) | |
Rename speed -> velocity in the particle system
Matches the convention set in the QtQuick module, for example by
ListView and Flickable.
Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'examples/quick')
| -rw-r--r-- | examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml | 8 | ||||
| -rw-r--r-- | examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml b/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml index bed03e99aa..e6bd7bf174 100644 --- a/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml +++ b/examples/quick/touchinteraction/multipointtouch/content/BearWhackParticleSystem.qml @@ -63,7 +63,7 @@ ParticleSystem { lifeSpan: 4000 + 800*(16-emitRate) maximumEmitted: 128 size: 64 - speed: PointDirection{ y: 40 + 10 * emitter.emitRate } + velocity: PointDirection{ y: 40 + 10 * emitter.emitRate } } Emitter { @@ -74,7 +74,7 @@ ParticleSystem { emitRate: 1000 size: 16 endSize: 8 - speed: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 120;} PointDirection { y: -60 }} + velocity: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 120;} PointDirection { y: -60 }} lifeSpan: 400 } Emitter { @@ -85,7 +85,7 @@ ParticleSystem { emitRate: 1000 size: 16 endSize: 8 - speed: AngleDirection {angleVariation: 180; magnitudeVariation: 180;} + velocity: AngleDirection {angleVariation: 180; magnitudeVariation: 180;} lifeSpan: 600 } Emitter { @@ -96,7 +96,7 @@ ParticleSystem { emitRate: 1000 size: 16 endSize: 8 - speed: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 80;} PointDirection { y: 40 }} + velocity: CumulativeDirection { AngleDirection {angleVariation: 180; magnitudeVariation: 80;} PointDirection { y: 40 }} lifeSpan: 600 } diff --git a/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml b/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml index 9788c5c665..7b32aa6630 100644 --- a/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml +++ b/examples/quick/touchinteraction/multipointtouch/content/ParticleFlame.qml @@ -53,10 +53,10 @@ ParticleSystem { } Emitter { id: emitter - speedFromMovement: 20 + velocityFromMovement: 20 emitRate: 80 lifeSpan: 1500 - speed: PointDirection{ y: -90; yVariation: 50; } + velocity: PointDirection{ y: -90; yVariation: 50; } acceleration: PointDirection{ xVariation: 100; yVariation: 90; } size: 51 sizeVariation: 53 |