diff options
author | Alan Alpert <aalpert@blackberry.com> | 2013-04-01 13:45:21 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-15 18:03:21 +0200 |
commit | 3dbbcc09e98d768a5b7b6c0a498f8aefd9e25b9e (patch) | |
tree | c7a26ae0803fe3881c08791637ee5796a14d680d /src/particles | |
parent | 5bf33901429e64ab91f30037e25ec04aab4b4c11 (diff) |
Embed some default particles.
Most prototype level particle effects, at least in our example code,
uses basic and generic particles. Embedding these images into the
particles plugin will facilitate prototyping with the particles API.
Currently finding an image and copying it between projects is a
relatively large development cost for quick particle system prototypes.
Change-Id: I077104915353ab298e2aabd36e2a0a2070030914
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/particles')
-rw-r--r-- | src/particles/particleresources/fuzzydot.png | bin | 0 -> 1799 bytes | |||
-rw-r--r-- | src/particles/particleresources/glowdot.png | bin | 0 -> 861 bytes | |||
-rw-r--r-- | src/particles/particleresources/star.png | bin | 0 -> 1550 bytes | |||
-rw-r--r-- | src/particles/particles.qrc | 3 | ||||
-rw-r--r-- | src/particles/qquickimageparticle.cpp | 16 |
5 files changed, 19 insertions, 0 deletions
diff --git a/src/particles/particleresources/fuzzydot.png b/src/particles/particleresources/fuzzydot.png Binary files differnew file mode 100644 index 0000000000..bc95b703c1 --- /dev/null +++ b/src/particles/particleresources/fuzzydot.png diff --git a/src/particles/particleresources/glowdot.png b/src/particles/particleresources/glowdot.png Binary files differnew file mode 100644 index 0000000000..5c83896d22 --- /dev/null +++ b/src/particles/particleresources/glowdot.png diff --git a/src/particles/particleresources/star.png b/src/particles/particleresources/star.png Binary files differnew file mode 100644 index 0000000000..0d592cfa87 --- /dev/null +++ b/src/particles/particleresources/star.png diff --git a/src/particles/particles.qrc b/src/particles/particles.qrc index 344f9489a4..582520405f 100644 --- a/src/particles/particles.qrc +++ b/src/particles/particles.qrc @@ -1,5 +1,8 @@ <RCC> <qresource prefix="/"> <file>particleresources/noise.png</file> + <file>particleresources/fuzzydot.png</file> + <file>particleresources/glowdot.png</file> + <file>particleresources/star.png</file> </qresource> </RCC> diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index e0572ef424..9a0601b944 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -623,6 +623,22 @@ void fillUniformArrayFromImage(float* array, const QImage& img, int size) The source image to be used. If the image is a sprite animation, use the sprite property instead. + + Since Qt 5.2, some default images are provided as resources to aid prototyping: + \table + \row + \li qrc:///particleresources/star.png + \li \inlineimage particles/star.png + \row + \li qrc:///particleresources/glowdot.png + \li \inlineimage particles/glowdot.png + \row + \li qrc:///particleresources/fuzzydot.png + \li \inlineimage particles/fuzzydot.png + \endtable + + Note that the images are white and semi-transparent, to allow colorization + and alpha levels to have maximum effect. */ /*! \qmlproperty list<Sprite> QtQuick.Particles2::ImageParticle::sprites |