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 <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/particles/qsgmodelparticle_p.h b/src/declarative/particles/qsgmodelparticle_p.h
index 31e4025bb4..aba64e4841 100644
--- a/src/declarative/particles/qsgmodelparticle_p.h
+++ b/src/declarative/particles/qsgmodelparticle_p.h
@@ -86,11 +86,11 @@ public slots:
     void freeze(QSGItem* item);
     void unfreeze(QSGItem* item);
 
-    void setFade(bool arg){if(arg == m_fade) return; m_fade = arg; emit fadeChanged();}
+    void setFade(bool arg){if (arg == m_fade) return; m_fade = arg; emit fadeChanged();}
 protected:
     virtual void reset();
-    virtual void reload(int idx);
-    virtual void initialize(int idx);
+    virtual void commit(int gIdx, int pIdx);
+    virtual void initialize(int gIdx, int pIdx);
     void prepareNextFrame();
 private slots:
     void updateCount();
@@ -101,7 +101,7 @@ private:
     QSGVisualDataModel *m_model;
     QVariant m_dataSource;
     QList<QSGItem*> m_deletables;
-    QList< int > m_requests;
+    QList< QSGParticleData* > m_requests;
     bool m_fade;
 
     QList<QSGItem*> m_pendingItems;
@@ -115,7 +115,7 @@ private:
 class QSGModelParticleAttached : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QSGModelParticle* particle READ particle CONSTANT);
+    Q_PROPERTY(QSGModelParticle* particle READ particle CONSTANT)
 public:
     QSGModelParticleAttached(QObject* parent)
         : QObject(parent), m_mp(0)