aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles
Commit message (Collapse)AuthorAgeFilesLines
* Lift particle limits on desktopAlan Alpert2011-08-242-2/+6
| | | | | | | 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-244-48/+48
| | | | | | | 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-245-35/+231
| | | | | | | | | 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-246-20/+102
| | | | | | | | | | 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-246-52/+77
| | | | | | | | | 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-2319-814/+531
| | | | | | | | 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-232-1/+16
| | | | | | | | 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-225-35/+354
| | | | | | | | | 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>
* Add noCap and startTime properties to EmitterAlan Alpert2011-08-153-5/+63
| | | | | | | Change-Id: I8498b2e574a32bfbab9f139e718424572b1258a0 Reviewed-on: http://codereview.qt.nokia.com/2855 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove \since tagsAlan Alpert2011-08-1527-27/+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>
* Refactor BasicEmitter into EmitterAlan Alpert2011-08-157-436/+303
| | | | | | | | | | 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>
* 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>
* Renamed ShaderEffectItem to ShaderEffect and some API changes.Kim Motoyoshi Kalland2011-07-282-12/+16
| | | | | | | | | | | | | | | | The ShaderEffectItem was renamed to ShaderEffect to be consistent with other QML element names. The GLSL uniform variable qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is easier to type and remember. The GridMesh element was removed. The mesh resolution is now specified simply with a QSize. To make the transition easier, the old API will continue to work for some time, but will output warnings if used. Eventually, I will remove the old API completely. Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a Reviewed-on: http://codereview.qt.nokia.com/2270 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* compile when qreal is a floatGunnar Sletta2011-07-281-1/+1
| | | | | | Change-Id: I1e5c592f1cacb0a3a80e15b53011efb134db29f7 Reviewed-on: http://codereview.qt.nokia.com/2336 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add some more properties to JS particle typeAlan Alpert2011-07-2814-81/+113
| | | | | | | | | | | 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>
* Initial CustomEmitter and CustomAffector implementationAlan Alpert2011-07-2811-6/+710
| | | | | | | | 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>
* Manage m_activeCount centrallyAlan Alpert2011-07-282-8/+7
| | | | | | | | | | | | Fixes issue where it wasn't being managed right and kept going negative. This commit also adds setVisible in a few places missed by the last change. Task-number: QTBUG-20437 Change-Id: I4efaab7b34784dfbc42dd1acd0a5be3b38a8605a Reviewed-on: http://codereview.qt.nokia.com/2074 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Drive ParticleSystem with an animation insteadAlan Alpert2011-07-284-62/+112
| | | | | | | | | This will be helpful later, and also keeps the work in the main thread. Change-Id: Idf4b9e82a40f31a0b70edda731b85b6c853a1dac Reviewed-on: http://codereview.qt.nokia.com/1909 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Delete scene if you aren't going to use it.Alan Alpert2011-07-283-5/+20
| | | | | | | | | | 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>
* Crash even lessAlan Alpert2011-07-262-1/+1
| | | | | | | | | | Should not set pointer to zero if we're going to use it again. Task-number: QTBUG-20407 Change-Id: Iea1ea879bf3fe53e2e8ac8d93648ab28a0fc7b12 Reviewed-on: http://codereview.qt.nokia.com/2064 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Only manage opacity when m_fade is trueAlan Alpert2011-07-252-5/+6
| | | | | | | | | | In all cases, visualize lifecycle with 'visible' property instead. Task-number: QTBUG-20438 Change-Id: Ib0b732708e14ad043c5b673205eaec0467e38174 Reviewed-on: http://codereview.qt.nokia.com/2071 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Initial stab at docs for QtQuick.Particles 2.0Alan Alpert2011-07-2028-3/+645
| | | | | | | 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>
* Crash lessAlan Alpert2011-07-202-0/+4
| | | | | | | | | | | Can't run any particles without a system set. Just skip the 'prepareFrame' function in that case. Task-Number: QTBUG-20386 Change-Id: I22332636084d1696d5aff5386a5ca4ff0f2f1866 Reviewed-on: http://codereview.qt.nokia.com/1680 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-0856-958/+958
| | | | | | | | 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>
* Fix possible index out of bounds exceptionAlan Alpert2011-07-071-1/+5
| | | | | | | | | | The sprite engine count needs to grow to the same size as the system index count, as the indexes are synchronized. Change-Id: I299816bfe6ea437202a60078a512b8f1114cfea3 Reviewed-on: http://codereview.qt.nokia.com/1138 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Squashed Particle System Stateful RewriteAlan Alpert2011-07-0635-976/+1894
| | | | | | | | | | | | | | | | | | | | 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>
* Avoid crash on exitAlan Alpert2011-07-041-1/+1
| | | | | | | | | | QSParticlePainter could call QSGItem::mapFromItem while the scene was being destroyed. Change-Id: If9356dae6aadf97b853c2aaf51870751bbbab711 Reviewed-on: http://codereview.qt.nokia.com/1023 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones
* Updated tst_nodestest to use the DirtyForceUpdate flag.Kim Motoyoshi Kalland2011-06-231-2/+0
| | | | | | Changed test to use DirtyForceUpdate instead of DirtyAll, and removed DirtyRenderOrder and DirtyAll enums which should not be used.
* Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-06-211-2/+2
|\ | | | | | | into qtquick2
| * Compile when qreal is not a doubleGunnar Sletta2011-06-201-2/+2
| |
* | Rewrite last rewriteAlan Alpert2011-06-2118-672/+459
| | | | | | | | | | Also rewrite to have all particle state shared, not just common elements.
* | Rewrite particle system to cope with changing particle countsAlan Alpert2011-06-1517-388/+547
|/ | | | | | | 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
* Safer cleanup in model/item particleAlan Alpert2011-06-142-12/+14
|
* Add delegate property to ItemParticleAlan Alpert2011-06-105-28/+83
| | | | Also add burst(n,x,y) to ParticleEmitter, and a demo that uses both.
* Do delegate management outside the render threadAlan Alpert2011-06-092-14/+33
| | | | Very simple implementation, there's probably a better way to do it.
* Automatically set system if parent is a ParticleSystemAlan Alpert2011-06-095-3/+16
|
* Immense Particles Refactor Part DAlan Alpert2011-06-083-13/+13
| | | | | | | | | | | | | | | | | | | | Changed the names of several properties: FollowEmitter: emissionShape->emitShape emissionHeight->emitHeight emissionWidth->emitWidth Emitter: particlesPerSecond->emitRate particleDuration->lifeSpan particleDurationVariation->lifeSpanVariation maxParticles->emitCap particleSize->size particleEndSize->endSize particleSizeVariation->sizeVariation ImageParticle: image->source And stopped being silly in the example launcher.
* Immense Particles Refactor Part BAlan Alpert2011-06-076-10/+147
| | | | | Examples work again. Also augmented Wander and PointAttractor with physics modes.
* Immense Particles Refactor Part AAlan Alpert2011-06-0772-0/+8729
Qt.labs.particles 2.0 moved to QtQuick.Particles 2.0. All C++ classes changed names, some renaming of QML types. Also adds CustomParticle.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 02:46:08 +0000