diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 04:03:47 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 04:46:23 (GMT) |
| commit | 0ef5d89b540be963d1a8131f6625f990a4fe66e8 (patch) | |
| tree | fe640558b514dc1720525043b954aeafe3d15940 /demos/declarative | |
| parent | 0ced984d3e2cb2a7a1a219ae7a9b09ff4e15a55c (diff) | |
| download | Qt-0ef5d89b540be963d1a8131f6625f990a4fe66e8.zip Qt-0ef5d89b540be963d1a8131f6625f990a4fe66e8.tar.gz Qt-0ef5d89b540be963d1a8131f6625f990a4fe66e8.tar.bz2 | |
Particles cleaned up and placed in in qmlgraphics/
API changes:
Removed bool streamIn
Added int emissionRate
Added int emissionVariance
Added void burst(count, emissionRate=-1)
While rewriting the internals to accomodate this, all other outstanding
particles bugs were believed fixed.
Task-number: QT-2392 QT-2391 QT-2390 QT-2406
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/minehunt/Explosion.qml | 7 | ||||
| -rw-r--r-- | demos/declarative/samegame/content/BoomBlock.qml | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/demos/declarative/minehunt/Explosion.qml b/demos/declarative/minehunt/Explosion.qml index a997048..e337c46 100644 --- a/demos/declarative/minehunt/Explosion.qml +++ b/demos/declarative/minehunt/Explosion.qml @@ -16,13 +16,10 @@ Item { velocity: 100 velocityDeviation: 20 z: 100 - opacity: 0 - streamIn: false + opacity: 1 } states: [ State { name: "exploding"; when: explode == true - PropertyChanges { target: particles; count: 200 } - PropertyChanges { target: particles; opacity: 1 } - PropertyChanges { target: particles; emitting: false } // i.e. emit only once + StateChangeScript {script: particles.burst(200); } } ] diff --git a/demos/declarative/samegame/content/BoomBlock.qml b/demos/declarative/samegame/content/BoomBlock.qml index b0c297b..723e62a 100644 --- a/demos/declarative/samegame/content/BoomBlock.qml +++ b/demos/declarative/samegame/content/BoomBlock.qml @@ -26,9 +26,11 @@ Item { id:block } Particles { id: particles - width:1; height:1; anchors.centerIn: parent; opacity: 0 - lifeSpan: 700; lifeSpanDeviation: 600; count:0; streamIn: false - angle: 0; angleDeviation: 360; velocity: 100; velocityDeviation:30 + width:1; height:1; anchors.centerIn: parent; + emissionRate: 0; + lifeSpan: 700; lifeSpanDeviation: 600; + angle: 0; angleDeviation: 360; + velocity: 100; velocityDeviation:30; source: { if(type == 0){ "pics/redStar.png"; @@ -45,9 +47,7 @@ Item { id:block PropertyChanges { target: img; opacity: 1 } }, State{ name: "DeathState"; when: dying == true - PropertyChanges { target: particles; count: 50 } - PropertyChanges { target: particles; opacity: 1 } - PropertyChanges { target: particles; emitting: false } // i.e. emit only once + StateChangeScript { script: particles.burst(50); } PropertyChanges { target: img; opacity: 0 } StateChangeScript { script: block.destroy(1000); } } |