Particles module refactoring en masse

All the little changes in one commit.

StochasticDirection -> Direction
AngledDirection -> AngleDirection
TargetedDirection -> TargetDirection
QSGCustomParticle is now Affector's implementation (C++ only refactor)
FollowEmitter -> TrailEmitter
Kill -> Age and gained lifeLeft property
ModelParticle is removed, use ItemParticle instead.
Added RectangleShape to replace Shape for the case of Rectangles
Abstract Types are no longer createable, despite sensible defaults.
GLSL variables in CustomParticle now begin with qt_
JS variables are now such that x,vx,ax are current (old ones are now
initialX, initialVX, initialAX). Same for y. A few more were extended.
Emitter::emitCap -> Emitter::maximumEmitted. Set to -1 for noCap: false
Emitter::noCap is gone.
Emitter::emitting -> Emitter::enabled
Affector::active -> Affector::enabled
Affector::collisionParticles -> Affector::whenCollidingWith
Affector::signal is gone.
PointAttractor -> Attractor
Attractor/Wander::physics -> ::affectedParameter
ParticleSystem::fastForward is gone
ParticleSystem::startTime is gone (use Emitter::startTime)
ParticleSystem::clear -> ParticleSystem::empty
And various Doc fixes.

Change-Id: Ia3b02b987f692e6f1bd14c42e575381bdfb7bbb5
Reviewed-on: http://codereview.qt-project.org/4231
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

11 files changed, 39 insertions, 43 deletions

diff --git a/examples/declarative/particles/trails/combustion.qml b/examples/declarative/particles/trails/combustion.qml
index f244300524..e4a21e9beb 100644
--- a/examples/declarative/particles/trails/combustion.qml
+++ b/examples/declarative/particles/trails/combustion.qml
@@ -70,7 +70,7 @@ Rectangle {
                     color: "#2060160f"
                 }
                 SpriteGoal{
-                    collisionParticles: ["lit"]
+                    whenCollidingWith: ["lit"]
                     goalState: "lighting"
                     jump: true
                     systemStates: true
@@ -85,7 +85,7 @@ Rectangle {
                 name: "lit"
                 duration: 10000
                 onEntered: score++;
-                FollowEmitter{
+                TrailEmitter{
                     id: fireballFlame
                     particle: "flame"
 
@@ -99,7 +99,7 @@ Rectangle {
                     endSize: 4
                 }
 
-                FollowEmitter{
+                TrailEmitter{
                     id: fireballSmoke
                     particle: "smoke"
 
@@ -185,7 +185,7 @@ Rectangle {
             goalState: "lighting"
             jump: true
             systemStates: true
-            active: ma.pressed
+            enabled: ma.pressed
             width: 18
             height: 18
             x: ma.mouseX - width/2
diff --git a/examples/declarative/particles/trails/dynamicemitters.qml b/examples/declarative/particles/trails/dynamicemitters.qml
index dbf3f8fa82..dac5d93035 100644
--- a/examples/declarative/particles/trails/dynamicemitters.qml
+++ b/examples/declarative/particles/trails/dynamicemitters.qml
@@ -63,12 +63,11 @@ Rectangle{
             Emitter{
                 id: emitMore
                 system: sys
-                emitting: true
                 emitRate: 128
                 lifeSpan: 600
                 size: 16
                 endSize: 8
-                speed: AngledDirection{angleVariation:360; magnitude: 60}
+                speed: AngleDirection{angleVariation:360; magnitude: 60}
             }
 
             property int life: 2600
@@ -77,10 +76,9 @@ Rectangle{
             function go(){
                 xAnim.start();
                 yAnim.start();
-                container.emitting = true
+                container.enabled = true
             }
             system: sys
-            emitting: true
             emitRate: 32
             lifeSpan: 600
             size: 24
diff --git a/examples/declarative/particles/trails/fireballs.qml b/examples/declarative/particles/trails/fireballs.qml
index 4cc2eacc25..97a0c0ac5f 100644
--- a/examples/declarative/particles/trails/fireballs.qml
+++ b/examples/declarative/particles/trails/fireballs.qml
@@ -98,7 +98,7 @@ Rectangle {
         sizeVariation: 8
         endSize: 4
     }
-    FollowEmitter{
+    TrailEmitter{
         id: fireSmoke
         particle: "B"
         system: particles
@@ -116,7 +116,7 @@ Rectangle {
         sizeVariation: 8
         endSize: 16
     }
-    FollowEmitter{
+    TrailEmitter{
         id: fireballFlame
         anchors.fill: parent
         system: particles
@@ -133,7 +133,7 @@ Rectangle {
         endSize: 4
     }
     
-    FollowEmitter{
+    TrailEmitter{
         id: fireballSmoke
         anchors.fill: parent
         system: particles
diff --git a/examples/declarative/particles/trails/fireworks.qml b/examples/declarative/particles/trails/fireworks.qml
index a84f5d8b3c..437d9ee3d6 100644
--- a/examples/declarative/particles/trails/fireworks.qml
+++ b/examples/declarative/particles/trails/fireworks.qml
@@ -59,13 +59,13 @@ Rectangle{
                 name: "splode"
                 duration: 400
                 to: {"dead":1}
-                FollowEmitter{
+                TrailEmitter{
                     particle: "works"
                     emitRatePerParticle: 100
                     lifeSpan: 1000
-                    emitCap: 1200
+                    maximumEmitted: 1200
                     size: 8
-                    speed: AngledDirection{angle: 270; angleVariation: 45; magnitude: 20; magnitudeVariation: 20;}
+                    speed: AngleDirection{angle: 270; angleVariation: 45; magnitude: 20; magnitudeVariation: 20;}
                     acceleration: PointDirection{y:100; yVariation: 20}
                 }
             },
@@ -73,8 +73,7 @@ Rectangle{
                 name: "dead"
                 duration: 1000
                 Affector{
-                    onceOff: true
-                    signal: true
+                    once: true
                     onAffected: worksEmitter.burst(400,x,y)
                 }
             }
@@ -91,7 +90,7 @@ Rectangle{
             particle: "fire"
             width: parent.width
             y: parent.height
-            emitting: false
+            enabled: false
             emitRate: 80
             lifeSpan: 6000
             speed: PointDirection{y:-100;}
@@ -100,14 +99,14 @@ Rectangle{
         Emitter{
             id: worksEmitter
             particle: "works"
-            emitting: false
+            enabled: false
             emitRate: 100
             lifeSpan: 1600
-            emitCap: 6400
+            maximumEmitted: 6400
             size: 8
             speed: CumulativeDirection{
                 PointDirection{y:-100}
-                AngledDirection{angleVariation: 360; magnitudeVariation: 80;}
+                AngleDirection{angleVariation: 360; magnitudeVariation: 80;}
             }
             acceleration: PointDirection{y:100; yVariation: 20}
         }
diff --git a/examples/declarative/particles/trails/layered.qml b/examples/declarative/particles/trails/layered.qml
index d4a823b556..9af5f0bd64 100644
--- a/examples/declarative/particles/trails/layered.qml
+++ b/examples/declarative/particles/trails/layered.qml
@@ -53,7 +53,6 @@ Rectangle{
     }
     ParticleSystem{
         id: sys
-        startTime: 4000
     }
     Emitter{
         system: sys
@@ -61,6 +60,7 @@ Rectangle{
         width: root.width
         emitRate: 200
         lifeSpan: 4000
+        startTime: 4000
         speed: PointDirection{ y: -120; }
     }
     ImageParticle{
diff --git a/examples/declarative/particles/trails/list.qml b/examples/declarative/particles/trails/list.qml
index 7e8fb44003..b64e49456b 100644
--- a/examples/declarative/particles/trails/list.qml
+++ b/examples/declarative/particles/trails/list.qml
@@ -57,6 +57,7 @@ Rectangle {
         source: "content/star.png"
         color: "white"
         colorVariation: 0.0
+        rotationSpeed: 360
     }
 
     // Define a delegate component.  A component will be
@@ -95,11 +96,12 @@ Rectangle {
             Emitter{
                 anchors.fill: parent
                 system: particles;
-                emitting: anim.running
+                enabled: anim.running
                 emitRate: 600
                 lifeSpan: 600
                 size: 16
                 endSize: 8
+                sizeVariation: 8
             }
         }
     }
diff --git a/examples/declarative/particles/trails/overburst.qml b/examples/declarative/particles/trails/overburst.qml
index 620ae46088..baf1bf3046 100644
--- a/examples/declarative/particles/trails/overburst.qml
+++ b/examples/declarative/particles/trails/overburst.qml
@@ -47,7 +47,7 @@ Rectangle{
     height: 540
     ParticleSystem{
         id: sys
-        onClearChanged: if (clear) sys.pause();
+        onEmptyChanged: if (empty) sys.pause();
     }
     ImageParticle{
         system: sys
@@ -60,12 +60,12 @@ Rectangle{
         //burst on click
         id: bursty
         system: sys
-        emitting: ma.pressed
+        enabled: ma.pressed
         x: ma.mouseX
         y: ma.mouseY
         emitRate: 16000
-        emitCap: 4000
-        acceleration: AngledDirection{angleVariation: 360; magnitude: 360; }
+        maximumEmitted: 4000
+        acceleration: AngleDirection{angleVariation: 360; magnitude: 360; }
         size: 8
         endSize: 16
         sizeVariation: 4
@@ -78,7 +78,7 @@ Rectangle{
     MouseArea{
         width: 100
         height: 100
-        onClicked: bursty.noCap = true;
+        onClicked: bursty.maximumEmitted = -1;
         id: ma2
         Rectangle{
             anchors.fill: parent
diff --git a/examples/declarative/particles/trails/portal.qml b/examples/declarative/particles/trails/portal.qml
index 8cf323b0f5..85efd9a594 100644
--- a/examples/declarative/particles/trails/portal.qml
+++ b/examples/declarative/particles/trails/portal.qml
@@ -52,7 +52,6 @@ Rectangle{
     }
     ParticleSystem{ 
         id: particles 
-        startTime: 2000
     }
     ImageParticle{
         particles: ["center","edge"]
@@ -68,12 +67,11 @@ Rectangle{
         system: particles
         emitRate: 200
         lifeSpan: 2000
-        emitting: true
         size: 20
         sizeVariation: 2
         endSize: 0
         shape: EllipseShape{fill: false}
-        speed: TargetedDirection{
+        speed: TargetDirection{
             targetX: root.width/2 
             targetY: root.height/2
             proportionalMagnitude: true
@@ -83,22 +81,22 @@ Rectangle{
     Emitter{
         anchors.fill: parent
         particle: "edge"
+        startTime: 2000
         system: particles
         emitRate: 4000
         lifeSpan: 2000
-        emitting: true
         size: 20
         sizeVariation: 2
         endSize: 0
         shape: EllipseShape{fill: false}
-        speed: TargetedDirection{
+        speed: TargetDirection{
             targetX: root.width/2 
             targetY: root.height/2
             proportionalMagnitude: true
             magnitude: 0.1
             magnitudeVariation: 0.1
         }
-        acceleration: TargetedDirection{
+        acceleration: TargetDirection{
             targetX: root.width/2 
             targetY: root.height/2
             targetVariation: 200
diff --git a/examples/declarative/particles/trails/shimmer.qml b/examples/declarative/particles/trails/shimmer.qml
index d195a4477b..90b47bc6b7 100644
--- a/examples/declarative/particles/trails/shimmer.qml
+++ b/examples/declarative/particles/trails/shimmer.qml
@@ -72,7 +72,6 @@ Rectangle{
         system: particles
         emitRate: 2000
         lifeSpan: 2000
-        emitting: true
         size: 30
         sizeVariation: 10
     }
diff --git a/examples/declarative/particles/trails/trails.qml b/examples/declarative/particles/trails/trails.qml
index 689de4eb41..1b6f9e00c7 100644
--- a/examples/declarative/particles/trails/trails.qml
+++ b/examples/declarative/particles/trails/trails.qml
@@ -57,10 +57,10 @@ Rectangle{
     //burst on click
         id: bursty
         system: sys
-        emitting: false
+        enabled: false
         emitRate: 2000
         lifeSpan: 500
-        acceleration: AngledDirection{ angle: 90; angleVariation: 360; magnitude: 640; }
+        acceleration: AngleDirection{ angle: 90; angleVariation: 360; magnitude: 640; }
         size: 8
         endSize: 16
         sizeVariation: 4
@@ -68,12 +68,12 @@ Rectangle{
     Emitter{
         system: sys
         speedFromMovement: 4.0
-        emitting: ma.pressed
+        enabled: ma.pressed
         x: ma.mouseX
         y: ma.mouseY
         emitRate: 400
         lifeSpan: 2000
-        acceleration: AngledDirection{ angle: 90; angleVariation: 22; magnitude: 32; }
+        acceleration: AngleDirection{ angle: 90; angleVariation: 22; magnitude: 32; }
         size: 8
         endSize: 16
         sizeVariation: 8
diff --git a/examples/declarative/particles/trails/turbulence.qml b/examples/declarative/particles/trails/turbulence.qml
index 3f822c7889..62216c3460 100644
--- a/examples/declarative/particles/trails/turbulence.qml
+++ b/examples/declarative/particles/trails/turbulence.qml
@@ -91,9 +91,9 @@ Rectangle{
         endSize: 10
         sizeVariation: 10
         acceleration: PointDirection{ y: -40 }
-        speed: AngledDirection{ angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 }
+        speed: AngleDirection{ angle: 270; magnitude: 20; angleVariation: 22; magnitudeVariation: 5 }
     }
-    FollowEmitter{
+    TrailEmitter{
         id: smoke1
         width: root.width
         height: 258
@@ -108,9 +108,9 @@ Rectangle{
         endSize: 8
         sizeVariation: 8
         acceleration: PointDirection{ y: -40 }
-        speed: AngledDirection{ angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
+        speed: AngleDirection{ angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
     }
-    FollowEmitter{
+    TrailEmitter{
         id: smoke2
         width: root.width
         height: 232
@@ -124,6 +124,6 @@ Rectangle{
         endSize: 24
         sizeVariation: 8
         acceleration: PointDirection{ y: -40 }
-        speed: AngledDirection{ angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
+        speed: AngleDirection{ angle: 270; magnitude: 40; angleVariation: 22; magnitudeVariation: 5 }
     }
 }