| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Also added advancePosition property to Age, as it was needed for even this
simple example.
Change-Id: I614a719280efc1bc5140d07ab91ec0f1bc345788
Reviewed-on: http://codereview.qt-project.org/4871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Adds an example of colorized ImageParticle, and an example comparing
the particle system to dynamically created Images (which don't do too
badly when they're kept really simple).
Change-Id: Id9e8d0575a38ddde1c73d694bd5c062d56cbed42
Reviewed-on: http://codereview.qt-project.org/5047
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
| |
Recast as examples, not demos. Fewer licking face usages.
Change-Id: I02a03fb9af513cbc3dc2a94aa0843220f162593b
Reviewed-on: http://codereview.qt-project.org/4754
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I21d2492288adc84d3ef99633752e78a3ea232a4a
Reviewed-on: http://codereview.qt-project.org/5042
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: If145f1d02566f839abeb50df167db2b237499290
Reviewed-on: http://codereview.qt-project.org/4857
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ie816f1209711aae3b9cd1465f874919370c26028
Reviewed-on: http://codereview.qt-project.org/4875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ib5f244a61cb65db829ee83ec9e4d5e4189319a9f
Reviewed-on: http://codereview.qt-project.org/4936
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I3a982de8eaf31267a4d90e3cc3bedbf87400d34a
Reviewed-on: http://codereview.qt-project.org/4847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QMouseEvent now supports floating point coordinates, and
the graphics scene event is not be available in QtGui
anymore.
Change-Id: I28ab428a2d00fc1deef55b05c1c545e74838e105
Reviewed-on: http://codereview.qt.nokia.com/3991
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix build on Windows and compiler warnings.
Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.
Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Or at least closer to. Now uses curl noise off of a source noise image,
documented as usable, and not an immense performance drain (just a
normal one).
Change-Id: Iac11c98cd9589cbe6a41b2b30893ab40d541d18f
Reviewed-on: http://codereview.qt-project.org/4510
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1.Supports tiled canvas with canvasSize, tileSize and canvasWindow
2.Supports different rendering targets: Canvas.Image and
Canvas.FrameBufferObject by renderTarget property
3.Supports thread rendering when possible by threadRendering property.
4.Refactors QSGContext2D code, move some logic to
QSGContext2DCommandBuffer,QSGContext2DTexture,QSGContext2DTile, etc
5.Updates/adds some canvas examples
6.Some improvements for context2d API
6.1 drawImage() now loads image asynchoronously and draw images
automatically when they are ready
6.2 adds fillRule supports
6.3 add svg path supports
6.4 Pixel operations (getImageData/putImageData/createImageData)
now have better performance by using V8 indexed array accessors
6.5 Uses QTransform instead of QMatrix
6.6 Gradients/patterns now are V8 values, not QObjects
6.7 Supports measureText and TextMetrics interface
6.8 Gives not support warnings for unimplemented functions
(drawFocusRing,setCaretSelectionRect,caretBlinkRate)
6.9 Better error handling, throw standard DOM exceptions according
to the HTML5 context2d spec.
6.10 Adds shear, resetTransform to matrix operations
6.11 Adds roundedRect, ellipse, text to path operations
6.12 Adds new features to CanvasImageData interface
1) adds mirror() function
2) adds filter() function, include the following filters:
Threshold
GrayScale
Brightness
Invert
Blur
Blend
Opaque
Convolute
7. Adds documentations
Change-Id: Id19224260d6a3fdc589d1f9681c34a88a7e7b3e5
Reviewed-on: http://codereview.qt-project.org/3621
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I940ced2e84a86daabc5158d348b05b7532cb1c22
Reviewed-on: http://codereview.qt-project.org/4314
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Original images were causing warnings with libpng.
Change-Id: I697f20ee3968b0e27f12dc55eb20ea46f809a46e
Reviewed-on: http://codereview.qt-project.org/4496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
One non-essential varaible still had the old name, leading to a
non-fatal warning. It is now rectified.
Change-Id: I4ebcf92b3521aeff92e4da89f41b8c81c2f6ab96
Reviewed-on: http://codereview.qt-project.org/4494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Makes it possible to pause the system when all particles are expired.
Change-Id: Iebeb987c2e2af261bdffa4584d75f3b108dcf050
Reviewed-on: http://codereview.qt-project.org/4046
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Includes skipping rendering when paused.
Change-Id: I353ac415fb877917d46ba1832ad9cb5a84640b57
Reviewed-on: http://codereview.qt.nokia.com/4041
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A straight copy of what was available in Qt 4.7, modified
where necessary to use the QtQuick1 module, so as to still
compile and run in Qt5.
Change-Id: I9a95afb96e3f522fbd600eb6dbd3fdac9558b059
Reviewed-on: http://codereview.qt.nokia.com/4019
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also add missing licence header and update example tests
Change-Id: Ic2dc8c893ddf22f646eaeba86b6f3b4a2772726c
Reviewed-on: http://codereview.qt.nokia.com/3844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Minehunt and abstractitemmodel examples use QSGview
Snake now using Particles 2.0
Minor examples and twitter have updated imports
Removed duplicate delegate example
Change-Id: I04f8f8aeb8ef34ab2a8678ccc1d6d594b9db166e
Reviewed-on: http://codereview.qt.nokia.com/3630
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And remove many duplicate and obsolete files
Change-Id: I5416b2b276893d85233918b1a24a30659830d42e
Reviewed-on: http://codereview.qt.nokia.com/3623
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I7181c3d26e85459597f06bba174885ced40ffe1d
Reviewed-on: http://codereview.qt.nokia.com/3618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also make abstractitemmodel example compile in 5.0 and
remove obsolete files.
Change-Id: Ic09f3878bb0b070e0f77398599d39952758acb8f
Reviewed-on: http://codereview.qt.nokia.com/3615
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I187acb734e78552088b85503dd3542e1b1101944
Reviewed-on: http://codereview.qt.nokia.com/3556
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Ib506f6b1daf431135c6608bdf1c5ea3afe08b213
Reviewed-on: http://codereview.qt.nokia.com/3551
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: If29cf056b37fbc45e29d81dac43414261aa74034
Reviewed-on: http://codereview.qt.nokia.com/3545
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|/
|
|
|
|
|
| |
Change-Id: I5ca6a459df532a5c551430f3f1029ec961a75233
Reviewed-on: http://codereview.qt.nokia.com/3441
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Avoid hiding the Item properties, which still have an effect.
Change-Id: I2449c376fe0f2c769792e4bb7b23899672cce5e1
Reviewed-on: http://codereview.qt.nokia.com/3837
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Attributes and a sample function are now prepended to the vertex shader,
allowing many to become simple again.
Change-Id: Ie1fbc864bd0d58647cb67994b96c2cb88db92f10
Reviewed-on: http://codereview.qt.nokia.com/3839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Inverse proportionality is now properly named, direct proportionality
is added, and constant as well (in case they all just draw towards a
point).
Change-Id: I6187c0df908fdf20e2bb0b0a1007ebcc38dd3ac2
Reviewed-on: http://codereview.qt.nokia.com/3868
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: I368acd65e9d352ecc04f4f7aaa3efc43d4530530
Reviewed-on: http://codereview.qt.nokia.com/3440
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an attached property type to the base positioner class.
This allows items within a positioner (Row, Column, Grid, Flow) to
determine their index inside the positioner, as well as whether
they are the first or last items. Non-visible items are ignored,
as in the positioner layout objects themselves. It may be useful
to expand this in the future to contain more information specific
to the positioner, for example row/column for Grid.
Task-number: QTBUG-19211
Change-Id: I10a8c9ca5528dd12811125cae8a9b4d2e3747972
Reviewed-on: http://codereview.qt.nokia.com/2983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Some of them weren't scaling well when in the examples launcher.
Change-Id: Ib6049fb5b3c9a99775008ae9072750c2424ad6ed
Reviewed-on: http://codereview.qt.nokia.com/2857
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
Change-Id: I9045f9b76f7c681cf828aa60659abb4c6b521e11
Reviewed-on: http://codereview.qt.nokia.com/2856
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
A little more imperative with dialogs controlled from script, but better
separation of GameArea and UI. Also removes old highscore script that
was never used.
Change-Id: Ib244acc90b0fc92b3a6534169e429b6acef0838e
Reviewed-on: http://codereview.qt.nokia.com/2798
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ie6a7e825afac9a969a71487b93800180ff3be90d
Reviewed-on: http://codereview.qt.nokia.com/2532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The example is interesting as debugging tool too.
Change-Id: I9ba69a85f21b776bbfcc65469c8a0e90426f21fd
Reviewed-on: http://codereview.qt.nokia.com/2495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I4e6b068ca9ceb0b7f76a6548d1b7a8789bc4bf39
Reviewed-on: http://codereview.qt.nokia.com/2237
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: Ie79859af8572c3c79185d98c54c2aae35190d257
Reviewed-on: http://codereview.qt.nokia.com/1908
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Seems to work fine.
Change-Id: I2da6487a6b3a5dc9ce1fb2036450ef0a0588430f
Reviewed-on: http://codereview.qt.nokia.com/2149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|