aboutsummaryrefslogtreecommitdiffstats
path: root/src/particles
diff options
context:
space:
mode:
Diffstat (limited to 'src/particles')
-rw-r--r--src/particles/particleresources/fuzzydot.pngbin0 -> 1799 bytes
-rw-r--r--src/particles/particleresources/glowdot.pngbin0 -> 861 bytes
-rw-r--r--src/particles/particleresources/star.pngbin0 -> 1550 bytes
-rw-r--r--src/particles/particles.qrc3
-rw-r--r--src/particles/qquickimageparticle.cpp16
5 files changed, 19 insertions, 0 deletions
diff --git a/src/particles/particleresources/fuzzydot.png b/src/particles/particleresources/fuzzydot.png
new file mode 100644
index 0000000000..bc95b703c1
--- /dev/null
+++ b/src/particles/particleresources/fuzzydot.png
Binary files differ
diff --git a/src/particles/particleresources/glowdot.png b/src/particles/particleresources/glowdot.png
new file mode 100644
index 0000000000..5c83896d22
--- /dev/null
+++ b/src/particles/particleresources/glowdot.png
Binary files differ
diff --git a/src/particles/particleresources/star.png b/src/particles/particleresources/star.png
new file mode 100644
index 0000000000..0d592cfa87
--- /dev/null
+++ b/src/particles/particleresources/star.png
Binary files differ
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 d571641bad..0145ce4edb 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