aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/qsgimageparticle_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Rename QSG* to QQuick* in particles folderAlan Alpert2011-10-251-432/+0
| | | | | Change-Id: I793eaf16f3810df0cb0f9f8482ac0b9d6137595d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-8/+8
| | | | | | | | | | | | | | | | | | | | | | 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>
* Sprites can now have varying width and heightAlan Alpert2011-10-051-1/+13
| | | | | | | | | | | | | Varying between Sprites, or between width and height, not within a single Sprite. For ImageParticle only, SpriteImage changes will be in a later commit. Also adds spriteInterpolation boolean. Change-Id: I80681e44f26985a6f6a6b83bd162f6231c7f28c4 Reviewed-on: http://codereview.qt-project.org/6002 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use m_pleaseReset more consistentlyAlan Alpert2011-09-231-2/+0
| | | | | | | | | | Everyone had their own, and so they could conflict or be randomly un-initialized. Change-Id: Ife2c5d9972b881235e4d3a5e2a33979174de2fbc Reviewed-on: http://codereview.qt-project.org/5370 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* More ImageParticle sharingAlan Alpert2011-09-201-16/+19
| | | | | | | | Basic implementation of explicitAnimation, and RESET methods/docs added Change-Id: Ic522153b5287a97ba35e931cc6bddcde5d139fe7 Reviewed-on: http://codereview.qt-project.org/5182 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Initial ImageParticle sharingAlan Alpert2011-09-201-0/+10
| | | | | | | | | | | This allows particles rendered by ImageParticle to share some of their randomly generated state. Still to come are reset methods and animData sharing (so animations can look synced) Change-Id: Ia805e1b3735b15fba7bd14778ed7abd795b11f06 Reviewed-on: http://codereview.qt-project.org/5114 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'refactor'Gunnar Sletta2011-09-131-0/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/context2d/qsgcanvasitem.cpp src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/context2d/qsgcontext2d_p_p.h src/declarative/particles/qsgcustomparticle.cpp src/declarative/particles/qsgparticlesystem.cpp Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
| * Merge branch 'master' into refactorGunnar Sletta2011-09-121-11/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * | Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-011-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | | Refactor SpriteEngine out of StochasticEngineAlan Alpert2011-09-131-2/+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-11/+11
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Initial entryEffect support for ImageParticleAlan Alpert2011-08-241-0/+16
| | | | | | | | | | 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-4/+0
| | | | | | | | | 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-25/+72
| | | | | | | | 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-0/+1
| | | | | | | | 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-1/+5
| | | | | | | | | 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 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>
* 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-8/+8
| | | | | | | | | | | | | | | | | | | | 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-22/+5
| | | | | Also rewrite to have all particle state shared, not just common elements.
* Rewrite particle system to cope with changing particle countsAlan Alpert2011-06-151-2/+11
| | | | | | | 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 DAlan Alpert2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | 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 AAlan Alpert2011-06-071-0/+352
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-06-17 06:25:17 +0000