Squashed Particle System Stateful Rewrite

Add TargetAffector
Fix for ParticlePainter offsets
Adds a particleStates property to ParticleSystem
Augment SpriteGoal to change system states as well
Also add 'collidingParticles' list to affector.
Particle Stochastic States Now actually working, and you can put
emitters, affectors and painters inside their targeted state.
Fireworks example uses states instead of delegates.
Replaced the delegate example with a text thing.
The examples launcher now also contains all the custom examples.
Adds CumulativeDirection and working null Affector (for affected
signal).
Add spaces after all flow control keywords.

Change-Id: I77b7e3044a9800dbfff6db833914d63127602cf5
Reviewed-on: http://codereview.qt.nokia.com/968
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/declarative/items/qsgsprite_p.h b/src/declarative/items/qsgsprite_p.h
index 652a4cd482..c20599853f 100644
--- a/src/declarative/items/qsgsprite_p.h
+++ b/src/declarative/items/qsgsprite_p.h
@@ -45,6 +45,7 @@
 #include <QObject>
 #include <QUrl>
 #include <QVariantMap>
+#include <QDeclarativeListProperty>
 
 QT_BEGIN_HEADER
 
@@ -64,13 +65,17 @@ class QSGSprite : public QObject
     Q_PROPERTY(int frameHeight READ frameHeight WRITE setFrameHeight NOTIFY frameHeightChanged)
     Q_PROPERTY(int frameWidth READ frameWidth WRITE setFrameWidth NOTIFY frameWidthChanged)
     Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
-    Q_PROPERTY(int durationVariance READ durationVariance WRITE setDurationVariance NOTIFY durationVarianceChanged)
+    Q_PROPERTY(int durationVariation READ durationVariance WRITE setDurationVariance NOTIFY durationVarianceChanged)
     Q_PROPERTY(qreal speedModifiesDuration READ speedModifer WRITE setSpeedModifier NOTIFY speedModifierChanged)
     Q_PROPERTY(QVariantMap to READ to WRITE setTo NOTIFY toChanged)
 
+    Q_PROPERTY(QDeclarativeListProperty<QObject> particleChildren READ particleChildren DESIGNABLE false)//### Hidden property for in-state system definitions - ought not to be used in actual "Sprite" states
+    Q_CLASSINFO("DefaultProperty", "particleChildren")
 public:
     explicit QSGSprite(QObject *parent = 0);
 
+    QDeclarativeListProperty<QObject> particleChildren();
+
     QUrl source() const
     {
         return m_source;
@@ -136,6 +141,8 @@ signals:
 
     void durationVarianceChanged(int arg);
 
+    void entered();//### Just playing around - don't expect full state API
+
 public slots:
 
     void setSource(QUrl arg)
@@ -224,6 +231,7 @@ private:
     QVariantMap m_to;
     qreal m_speedModifier;
     int m_durationVariance;
+
 };
 
 QT_END_NAMESPACE