aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/qsgimageparticle.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Lift particle limits on desktopAlan Alpert2011-08-241-1/+3
| | | | | | | Change-Id: I65d897273cd0e3a2ea58c78b0cde08a388506f84 Reviewed-on: http://codereview.qt.nokia.com/3355 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Switch from textures to uniform arrays for size/opacity tablesAlan Alpert2011-08-241-35/+38
| | | | | | | Change-Id: Iafc5eaa80f68345cc3b14fe0b2d997c1af435419 Reviewed-on: http://codereview.qt.nokia.com/3388 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Compile on MacAlan Alpert2011-08-241-10/+25
| | | | | | | Change-Id: I4e1deb5a5430af79430e3c1fc22f16461672586d Reviewed-on: http://codereview.qt.nokia.com/3389 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Switch to using one shader and #ifdefsAlan Alpert2011-08-241-18/+26
| | | | | | | | | Also clean up the shader code a little Change-Id: I98062ae729c145901e1d218a698672672ca1bf26 Reviewed-on: http://codereview.qt.nokia.com/3298 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Initial entryEffect support for ImageParticleAlan Alpert2011-08-241-0/+43
| | | | | | | | | | Implementation for tabled and above is different, coming in a later commit. Change-Id: I7ad16a173521bdcef4ddb68f594be7c942ddb505 Reviewed-on: http://codereview.qt.nokia.com/3280 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Use point spritesAlan Alpert2011-08-241-36/+71
| | | | | | | | | Only for the simpler particles, at least for now. Change-Id: If777cf301894553849b78060aa23980aee7fb807 Reviewed-on: http://codereview.qt.nokia.com/3240 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add the rest of the tiered shaders to QSGImageParticleAlan Alpert2011-08-231-480/+355
| | | | | | | | Also simplifies the use of multiple shaders. Change-Id: Ib4e16406865407626e4e736e7daeba4855dc0574 Reviewed-on: http://codereview.qt.nokia.com/3174 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add console debugging for particlesAlan Alpert2011-08-231-1/+15
| | | | | | | | Enable with the environment variable QML_PARTICLES_DEBUG. Change-Id: I8aee2702e17f4ec6d18d8def9d57c5238d4c28ae Reviewed-on: http://codereview.qt.nokia.com/3136 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add a deformable level shader for QSGImageParticleAlan Alpert2011-08-221-28/+267
| | | | | | | | | This shader also implements sizeTable in a GL ES 2 compliant way. Change-Id: If31ee01a521c1fe13f59f7d6376185bafcefedfc Reviewed-on: http://codereview.qt.nokia.com/3132 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove \since tagsAlan Alpert2011-08-151-1/+0
| | | | | | | | | It's a new module, of course they're new in this version. Change-Id: I8bce4d452161cd581c046fec62a41cac4e0609ed Reviewed-on: http://codereview.qt.nokia.com/2854 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Code cleanupAlan Alpert2011-07-291-8/+4
| | | | | | | Change-Id: I97ecc41fcb7255981c863996064cf6d6bae7ebbb Reviewed-on: http://codereview.qt.nokia.com/2356 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add some more properties to JS particle typeAlan Alpert2011-07-281-4/+4
| | | | | | | | | | | Adds the current position, velocity and acceleration. While we're at it, renaming the velocity vars from sx,sy to vx,vy Change-Id: I87f582169c7873c45a6fd453052b25c4dc940f3e Reviewed-on: http://codereview.qt.nokia.com/2021 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Delete scene if you aren't going to use it.Alan Alpert2011-07-281-5/+13
| | | | | | | | | | Also make QDeclarativeOpenMetaObjectType zero its engine when the engine dies, because this was leading to problems when the scene wasn't deleted. Also fixes a few other potential deletion problems. Change-Id: I37fa2d1a0b438a6ea7d8cf4c5c9d0bd869faa959 Reviewed-on: http://codereview.qt.nokia.com/2250 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Initial stab at docs for QtQuick.Particles 2.0Alan Alpert2011-07-201-0/+72
| | | | | | | Change-Id: I3c53f7998dff95616a994edf19094fa4007d74ab Reviewed-on: http://codereview.qt.nokia.com/1388 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fixed rendering errors in complex particle system.Samuel Rødal2011-07-111-10/+7
| | | | | | | | | | | We need to set the texture unit of the texture uniform as well, and we might as well set all the texture units in initialize() since they're constant. Change-Id: Ifcc690351ec7d1db1d98ab74644e248ec43cd328 Reviewed-on: http://codereview.qt.nokia.com/1410 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@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-230/+255
| | | | | | | | | | | | | | | | | | | | 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>
* Rewrite last rewriteAlan Alpert2011-06-211-272/+138
| | | | | Also rewrite to have all particle state shared, not just common elements.
* Rewrite particle system to cope with changing particle countsAlan Alpert2011-06-151-90/+165
| | | | | | | And might do it again... Caught up in this massive change were the following smaller ones: -Some custom particle examples -delegate property on ItemParticle and an example with it
* Immense Particles Refactor Part AAlan Alpert2011-06-071-0/+993
Qt.labs.particles 2.0 moved to QtQuick.Particles 2.0. All C++ classes changed names, some renaming of QML types. Also adds CustomParticle.