aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/qsgparticlesmodule.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename QSG* to QQuick* in particles folderAlan Alpert2011-10-251-120/+0
| | | | | Change-Id: I793eaf16f3810df0cb0f9f8482ac0b9d6137595d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fold Move into AffectorAlan Alpert2011-10-241-2/+0
| | | | | | | | | | | | | | | | | | Since 'Move' was just a generic physics property affector, it makes sense to fold it into the generic affector as an easier way of implementing the common case of custom affector (and much faster, since it doesn't hit JS). For completeness in the Move behavior, 'once' now applies the effect of affectors over a second in that one time, so as to avoid exposing the simulation tick. This allows once to have actual meaning for continous affectors. Gravity is also going to be kept around as a convenience (although it will change slightly), so just removing its deprecation warning. Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Affectors now simulate with a minimum granularityAlan Alpert2011-10-241-2/+0
| | | | | | | | | | Since all time is sourced from the ParticleSystem, the easiest way is to alter the common time point while doing the multiple simulation runs. Also removes the experimental TargetAffector. Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324a Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add Move affectorAlan Alpert2011-10-141-0/+2
| | | | | | | | | Slated to replace the 'Gravity' affector which only did one specialized gravity usecase anyways. This one is more generic. Change-Id: I3cbb975bad24e8f6fca7e07b671aa8ba5a3a916c Reviewed-on: http://codereview.qt-project.org/6657 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Split GroupGoal out of SpriteGoalAlan Alpert2011-10-051-0/+2
| | | | | | | | | | Leaving SpriteGoal alone for a few weeks with a deprecation message, but a functioning GroupGoal has been added. Change-Id: I395046c00526e7caa38bdbc499a8191308c476fa Reviewed-on: http://codereview.qt-project.org/5950 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Declarative: Fix ASCII conversion warnings.Friedemann Kleint2011-09-301-4/+8
| | | | | | | Change-Id: Ide43c1e37eeda8e5dc2c2d24b99c3b4f96e1b53e Reviewed-on: http://codereview.qt-project.org/5867 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Refactor SpriteEngine out of StochasticEngineAlan Alpert2011-09-131-0/+2
| | | | | | | | | | | | Also add ParticleGroups which use only StochasticStates Simplistic change for now, just to focus the API for the particle system. ParticleGroup elements replace the particleStates property on the system, and the term "group" is now used more consistently. Change-Id: I6456f9c521b8166ccd94ea953275557bcfbf6423 Reviewed-on: http://codereview.qt-project.org/4699 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Particles module refactoring en masseAlan Alpert2011-09-081-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Absorb CustomEmitter/AffectorAlan Alpert2011-08-241-4/+0
| | | | | | | | | | The signal is now on the Emitter/Affector base type, but only emitted if connected to (to save creating the v8 object) Change-Id: Ib5522e0f760caa17a6ad731b2dfbce9994a7664e Reviewed-on: http://codereview.qt.nokia.com/3393 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Refactor BasicEmitter into EmitterAlan Alpert2011-08-151-8/+6
| | | | | | | | | | No real point having a separate class, and it makes the docs more complex. Change-Id: I48aa7bafce541b0b5b792351adb5edf77fc67de2 Reviewed-on: http://codereview.qt.nokia.com/2853 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Initial CustomEmitter and CustomAffector implementationAlan Alpert2011-07-281-2/+6
| | | | | | | | Currently basic and can't access all properties. Change-Id: I66efc235112cffcf1a3ca5cc69099a5d09ec7691 Reviewed-on: http://codereview.qt.nokia.com/1950 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Squashed Particle System Stateful RewriteAlan Alpert2011-07-061-2/+5
| | | | | | | | | | | | | | | | | | | | 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>
* Immense Particles Refactor Part AAlan Alpert2011-06-071-0/+111
Qt.labs.particles 2.0 moved to QtQuick.Particles 2.0. All C++ classes changed names, some renaming of QML types. Also adds CustomParticle.