aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
Commit message (Collapse)AuthorAgeFilesLines
* Doc fixAlan Alpert2013-05-151-1/+1
| | | | | | Task-number: QTBUG-31155 Change-Id: I4f1ac7c31ce6d4529c368d796706aa5f93a78d1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* pixelIndex -> pixel since image is now 32-bitGunnar Sletta2013-05-071-1/+1
| | | | | Change-Id: Iac3c8d60d531a93ce6e862dbdfdf53e49e0d2185 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Only use emitCap when we run into infinite particlesAlan Alpert2013-05-041-1/+3
| | | | | | | | | | | | | | | | | | | emitCap is intended to prevent issues with multiple emission of infinite life particles, but it can currently prevent emission of any particles when particleCount() changes after a reset. Tracking particleCount() on changes would be inefficient and be more work to integrate with the correct behavior of infinite particles, so this patch delays the impact of emitCap until an infinite particle is discovered. This will lead to a subtle behavior difference of limiting infinite particle counts based on the count at the first emission, not the first reset, which could be construed as a bug fix in some situations. This seems reasonable as a futher subtle behavior change will be needed in the future to properly support varying counts of infinite particles. Task-number: QTBUG-30915 Change-Id: I4172aee1d03f00cc63ce7c9d12ace052bc41436d Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Optimize particle mask extruderGunnar Sletta2013-04-261-11/+24
| | | | | Change-Id: Ideed246f49301f826935d3fe4a25a3b593ee6b07 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Re-implemented itemChange must always call QQuickItem::itemChangeShawn Rutledge2013-04-261-1/+1
| | | | | | | | | | Documentation for that fact, and the windowChanged signal. Fix existing QQuickItem subclasses which didn't call QQuickItem::itemChange. Examples should rather connect to the windowChanged() signal. Change-Id: Ieddcdbe69f849ddb120b64be9c5e0a21393b0ed9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Use the actual size of the image for the iteration.Gunnar Sletta2013-04-231-2/+4
| | | | | | | | If the rectangle dimension was a floating-point value, we could sample outside the image, causing tons of warnings. Change-Id: I10abece9a6b0cf769551f554fb5999d5d90e4c9d Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Use triangle strips for particles on Mac OS X, ATI cards.Gunnar Sletta2013-04-161-0/+9
| | | | | Change-Id: Ie831fc6f8f8cdd891c15dc028383b191662416fc Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Replace deprecated V8 functionsPeter Varga2013-03-111-1/+1
| | | | | | | | The External::Wrap and External::Unwrap functions became deprecated in the mainline V8. Replace them as it is officially proposed. Change-Id: Ieac1da53997da440a909939d86c98f17a124c068 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-072-1/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/textureprovider/etcprovider.h src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf tests/auto/quick/qquickflickable/tst_qquickflickable.cpp Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
| * docfix: Emitter.enabled was documented as Emitter.emitting.Gunnar Sletta2013-01-291-1/+1
| | | | | | | | | | Change-Id: I9500c336b9e11f858da95ff4ed783b70876f3fd6 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Introduce a workaround for a GLSL bug on BB10Fabian Bumberger2013-01-261-0/+4
| | | | | | | | | | | | | | | | When using the sizeTable property of the QQuickImageParticles, the vertex shader is not compiling. This is a workaround for a compiler bug on BB10. Change-Id: I32d5e92bc300304cb856d97b1310f607df1e48be Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2828-95/+0
| | | | | | | | | | | | | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ia07e99676e0134fde5e32880edb95e57c779a7ff Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Move the model classes from QtQuick to QtQmlAlan Alpert2013-01-241-1/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | This is needed for proper support of non-GUI instantiators in QtQml. Only private C++ classes are affected. Aside from name changes, model classes now operate on QObjects instead of QQuickItems, leading to minor changes in the implementation of QtQuick classes using them. The old QML type names will still be registered in the QtQuick import for the forseeable future, but pointing to the new classes. The new QML types will be added in a second commit. Classes Affected: QQuickVisualDataGroup -> QQmlDataGroup QQuickVisualDataModel -> QQmlDelegateModel QQuickVisualItemModel -> QQmlObjectModel QQuickVisualModel -> QQmlInstanceModel QQuickChangeSet -> QQmlChangeSet QQuickListAccessor -> QQmlListAccessor QQuickListCompositor -> QQmlListCompositor QQuickPackage -> QQuickPackage (just moved for now) Change-Id: Ia19e630e53bfa9e5d459e289596cd11df1ea3930 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Remove workaround for particle shader on BlackberryFabian Bumberger2013-01-162-10/+0
| | | | | Change-Id: Ibcf4b55323046fee4a18b4c5bf51c78ed8832a63 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Doc: correcting typo "the the"Nico Vertriest2013-01-141-1/+1
| | | | | | | | | | | Task-number: QTBUG-28756 Spurious repetition of the definite article Doc: corrected trailing space issue. Change-Id: I95c1c5773dc4b25dd0a3625343a67975783435fd Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1061-61/+61
| | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-1/+1
| | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf and dll by qt_module.prf. Change-Id: I449e49275622bac39b7d76af8855c417ddce21e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Apply full transformAlan Alpert2012-11-291-4/+7
| | | | | | | | | | | Previously the particle system was only applying the translaton of the relative transfrom from any emitters. Now the full transform is used. Task-number: QTBUG-25518 Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821c Reviewed-by: Martin Jones <martin.jones@jollamobile.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Blackberry: Workaround for GLSL compiler bug.Fabian Bumberger2012-11-092-0/+10
| | | | | Change-Id: If3ce968c0a0a2af4244671fe028a560843c9016a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Change qml list interfaceMarco Bubke2012-10-231-2/+2
| | | | | Change-Id: I185c6f4cef6105544504324c1616b5995c219fe3 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2361-1466/+1466
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* doc: fix some typos in .cpp filesSergio Ahumada2012-09-071-1/+1
| | | | | Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-111-3/+1
| | | | | Change-Id: Ia6bf273ff8ed63e13ea9f5c469b5f8e2702a4ee7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I8a13b3aca195b9e8331478d73cd338ab66d65d1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix uses of various qml doc commandsBea Lam2012-08-084-9/+9
| | | | | | | | | | | | | | Signals documented with \qmlsignal should indicate handler name, i.e. 'onSignal' rather than 'signal'. Methods documented with \qmlmethod do not need to document 'void' return values. Also the name of any documented attribute should be qualified with 'QtQuick2::<qmltype>'. Change-Id: I206dd9e8f39c3b84e029ae9d4101b05d0bfb3478 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fixes a crash in QQuickImageParticleBerthold Krevert2012-08-061-2/+4
| | | | | | | | Fixes this bug: If the property source is set to an empty string or not set at all, the application crashes due to a missing pointer check. Change-Id: I8c2a2ba738ceda573e655221fde37012f6bf3053 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Particle doc fixesBea Lam2012-08-032-7/+7
| | | | | Change-Id: I65e8ecdedde6d0faec8b8d61e320df73100faf2c Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Particles module doc fixesBea Lam2012-08-026-16/+17
| | | | | | | Fixing some uses of qdoc commands and other minor fixes Change-Id: I965f715ad8d7833c5a7b830d644c79ad51735da5 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiates.Jerome Pasion2012-07-3028-28/+55
| | | | | | | | | | -To simplify QDoc, \qmlclass is now \qmltype. -'\instantiates <C+++ class>' is for the types that are defined in C++. Change-Id: I29242d33daf7b972d8b86a356b9689638866b950 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Mark some declarative libraries as internal.Stephen Kelly2012-07-241-1/+1
| | | | | | | | | | | | The QtQuickParticles module is actually a QML plugin, even though it is installed to lib/, and it doesn't have useful public API. The QmlDevTools module is internal and non-stable API. This avoids creating CMake files for those modules. Change-Id: Iae7a66b18728d65aa6abd660365f0878bc6574a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QQuickCanvas renamesAlan Alpert2012-07-173-9/+9
| | | | | | | | | | | | | | | | QQuickCanvas is now called QQuickWindow QQuickCanvas::rootItem is now QQuickWindow::contentItem QQuickItem::canvas is now QQuickItem::window QQuickItem::ItemChangeData::canvas is also renamed window QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow The functions related to the color property have dropped the clear from their names. The first three changes have interim compatibility measures in place to ease the transition. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update the export macros in qtdeclarative.gitThiago Macieira2012-07-111-15/+5
| | | | | | | Use the new, simpler QT_STATIC macro. Change-Id: I86d9d1a0e2812896594bfb0e6945b194f896d775 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update Age affector doc referencesAlan Alpert2012-07-062-1/+4
| | | | | | Task-number: QTBUG-26240 Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cd Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Rename speed -> velocity in the particle systemAlan Alpert2012-06-2913-114/+114
| | | | | | | | Matches the convention set in the QtQuick module, for example by ListView and Flickable. Change-Id: I8df57ed1ced8128723d790c30c00cc1b2062787d Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix exports in QtQuickParticles.Friedemann Kleint2012-06-281-1/+1
| | | | | | | | Undo breakage introduced by 27416448a1c3259ecad80172ba35ab9aa504a78d. Change-Id: Ia01a97688ecb91137a2649948af7479bd8323936 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 'buildsystem'Oswald Buddenhagen2012-06-262-5/+3
|\ | | | | | | Change-Id: I230e776290761be7c811c3aec4d915367012fc99
| * build system cleanupsOswald Buddenhagen2012-06-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * use auto-defined QT_BUILD_*_LIB variablesOswald Buddenhagen2012-06-261-1/+1
| | | | | | | | | | Change-Id: Iefe0b0982ee482bc47b4f66e514a7d0900674e42 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * auto-generate module prisOswald Buddenhagen2012-06-261-1/+0
| | | | | | | | | | Change-Id: I90090bcf60ecc2c3fb31a38129edeae8ff0f1c55 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Delay custom emitter processingAlan Alpert2012-06-252-5/+9
|/ | | | | | | | It now happens after ParticlePainter intialization, so that custom emitters can affect painter specific parameters like color. Change-Id: I9a732713108580e57130588c175c69aa854c5b2f Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Avoid string-based lookup in IS_SIGNAL_CONNECTEDKent Hansen2012-06-104-4/+4
| | | | | | | | | | Specify the signal as a member function suitable for passing to QMetaMethod::fromSignal(), and use the new function QMetaObjectPrivate::signalIndex(QMetaMethod) to get the index in the signal range. Change-Id: If16daa24c2699f7749a17decb611cf395d89d0c4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* put private Qt dependencies below load(qt_module_config)Oswald Buddenhagen2012-06-071-1/+4
| | | | | | | this will soon be needed to omit them from the master include header. Change-Id: I8f62a228a68fd53605eaf3f39f412a7b30c529b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix affected signal and docsAlan Alpert2012-06-063-36/+45
| | | | | | | | | | | | Signal wasn't being called in its primary usecase, which was to interact without altering the particles. Docs have been updated to clarify the usecase as well. This also updates the position properties of custom affector to more accurately specify if they caused changes. Change-Id: Ia411d9e81002443a56ed8bab9232f1aad49a4c5e Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Doc: Grouped Qt Quick types into several groupsJerome Pasion2012-06-0628-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -created new groups and converted some overviews into group pages -edited type documentation and added \ingroup -articles still need title fixes and link fixes Groups: qtquick-visual-types qtquick-item-graphics qtquick-shaders qtquick-canvas qtquick-text qtquick-text-validator qtquick-interaction qtquick-positioners qtquick-transformations qtquick-states qtquick-animation-define qtquick-animation-properties qtquick-animation-control qtquick-animation-modifiers qtquick-images-sprites qtquick-images qtquick-models qtquick-containers qtquick-views qtquick-paths qtquick-utility Task: QTBUG-25685 Change-Id: I81d4df3320bf5daad5cabb5e42408013fb24f464 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Doc: Sanitized QML typesNico Vertriest2012-05-2428-28/+29
| | | | | | | | | | -modified \brief -checked QML modules -added qml directory to the qdocconf file -added particles directory to the qdocconf file Change-Id: I589e32d3106cda37c7fa4d55a941afd9876fc2b2 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Organize data members in QQuickParticleDataAlan Alpert2012-05-241-7/+13
| | | | | Change-Id: Ibf14dc0f9ef9e17225f07f31276085c9ca83d4f1 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Flesh out the sprite documentationAlan Alpert2012-05-141-0/+2
| | | | | | | Task-number: QTBUG-24770 Change-Id: I40c46aa29ffdcc5899bece46c4b6227ca29695cd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Avoid overzealous image clearing.Alan Alpert2012-05-101-1/+0
| | | | | | | Task-number: QTBUG-25527 Change-Id: I4b8e1b16c869feb419212e117f3fec865fb546e3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove QSGEngineGunnar Sletta2012-05-031-1/+0
| | | | | Change-Id: Iaab0d9f607b1f4ca6dfb13495a456d1b31bb980a Reviewed-by: Lars Knoll <lars.knoll@nokia.com>