Squashed Particle System Stateful Rewrite
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 4 Jul 2011 08:15:28 +0000 (18:15 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 6 Jul 2011 08:09:09 +0000 (10:09 +0200)
commit29c4b643272a43022081cce063394bac823ab529
tree10e4fe15bdf68dec90edac0d67b949a92d9204d5
parent87822d24df32311a50dc87ded55ad4d17e8226f0
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>
53 files changed:
demos/declarative/flickr/content/StreamView.qml
examples/declarative/particles/custom/delegates.qml [new file with mode: 0644]
examples/declarative/particles/exampleslauncher.qml
examples/declarative/particles/launcherContent/icons/combustion.png [new file with mode: 0644]
examples/declarative/particles/launcherContent/icons/delegates.png [new file with mode: 0644]
examples/declarative/particles/launcherContent/icons/fireworks.png [new file with mode: 0644]
examples/declarative/particles/launcherContent/icons/shader.png [new file with mode: 0644]
examples/declarative/particles/modelparticles/package.qml
examples/declarative/particles/modelparticles/stream.qml
examples/declarative/particles/snow/snow.qml
examples/declarative/particles/trails/combustion.qml [new file with mode: 0644]
examples/declarative/particles/trails/content/matchmask.png [new file with mode: 0644]
examples/declarative/particles/trails/dynamicemitters.qml
examples/declarative/particles/trails/fireworks.qml [moved from examples/declarative/particles/custom/fireworks.qml with 62% similarity]
src/declarative/items/qsgsprite.cpp
src/declarative/items/qsgsprite_p.h
src/declarative/items/qsgspriteengine.cpp
src/declarative/items/qsgspriteengine_p.h
src/declarative/particles/particles.pri
src/declarative/particles/qsgcumulativedirection.cpp [new file with mode: 0644]
src/declarative/particles/qsgcumulativedirection_p.h [new file with mode: 0644]
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgcustomparticle_p.h
src/declarative/particles/qsgemitter.cpp
src/declarative/particles/qsgfollowemitter.cpp
src/declarative/particles/qsgfriction.cpp
src/declarative/particles/qsggravity.cpp
src/declarative/particles/qsgimageparticle.cpp
src/declarative/particles/qsgimageparticle_p.h
src/declarative/particles/qsgitemparticle.cpp
src/declarative/particles/qsgitemparticle_p.h
src/declarative/particles/qsgkill.cpp
src/declarative/particles/qsglineextruder.cpp
src/declarative/particles/qsgmaskextruder.cpp
src/declarative/particles/qsgmodelparticle.cpp
src/declarative/particles/qsgmodelparticle_p.h
src/declarative/particles/qsgparticleaffector.cpp
src/declarative/particles/qsgparticleaffector_p.h
src/declarative/particles/qsgparticleemitter.cpp
src/declarative/particles/qsgparticleextruder.cpp
src/declarative/particles/qsgparticlepainter.cpp
src/declarative/particles/qsgparticlepainter_p.h
src/declarative/particles/qsgparticlesmodule.cpp
src/declarative/particles/qsgparticlesystem.cpp
src/declarative/particles/qsgparticlesystem_p.h
src/declarative/particles/qsgpointattractor.cpp
src/declarative/particles/qsgspritegoal.cpp
src/declarative/particles/qsgspritegoal_p.h
src/declarative/particles/qsgtargetaffector.cpp [new file with mode: 0644]
src/declarative/particles/qsgtargetaffector_p.h [new file with mode: 0644]
src/declarative/particles/qsgtargeteddirection.cpp
src/declarative/particles/qsgturbulence.cpp
src/declarative/particles/qsgwander.cpp