aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@blackberry.com>2013-04-01 13:45:21 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-15 18:03:21 +0200
commit3dbbcc09e98d768a5b7b6c0a498f8aefd9e25b9e (patch)
treec7a26ae0803fe3881c08791637ee5796a14d680d /examples/quick
parent5bf33901429e64ab91f30037e25ec04aab4b4c11 (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 'examples/quick')
-rw-r--r--examples/quick/particles/affectors/content/attractor.qml6
-rw-r--r--examples/quick/particles/affectors/content/groupgoal.qml4
-rw-r--r--examples/quick/particles/affectors/content/move.qml6
-rw-r--r--examples/quick/particles/affectors/content/spritegoal.qml4
-rw-r--r--examples/quick/particles/affectors/content/turbulence.qml4
-rw-r--r--examples/quick/particles/customparticle/content/imagecolors.qml2
-rw-r--r--examples/quick/particles/emitters/content/burstandpulse.qml2
-rw-r--r--examples/quick/particles/emitters/content/customemitter.qml2
-rw-r--r--examples/quick/particles/emitters/content/emitmask.qml2
-rw-r--r--examples/quick/particles/emitters/content/maximumemitted.qml2
-rw-r--r--examples/quick/particles/emitters/content/shapeanddirection.qml2
-rw-r--r--examples/quick/particles/emitters/content/trailemitter.qml4
-rw-r--r--examples/quick/particles/emitters/content/velocityfrommotion.qml8
-rw-r--r--examples/quick/particles/imageparticle/content/colored.qml4
-rw-r--r--examples/quick/particles/imageparticle/content/colortable.qml2
-rw-r--r--examples/quick/particles/images.qrc3
-rw-r--r--examples/quick/particles/images/particle.pngbin861 -> 0 bytes
-rw-r--r--examples/quick/particles/images/particle4.pngbin1799 -> 0 bytes
-rw-r--r--examples/quick/particles/images/star.pngbin1550 -> 0 bytes
-rw-r--r--examples/quick/particles/system/content/dynamiccomparison.qml4
-rw-r--r--examples/quick/particles/system/content/dynamicemitters.qml2
-rw-r--r--examples/quick/particles/system/content/multiplepainters.qml2
-rw-r--r--examples/quick/particles/system/content/startstop.qml2
-rw-r--r--examples/quick/particles/system/content/timedgroupchanges.qml2
24 files changed, 33 insertions, 36 deletions
diff --git a/examples/quick/particles/affectors/content/attractor.qml b/examples/quick/particles/affectors/content/attractor.qml
index fd7fd65b9c..349132e61a 100644
--- a/examples/quick/particles/affectors/content/attractor.qml
+++ b/examples/quick/particles/affectors/content/attractor.qml
@@ -77,7 +77,7 @@ Rectangle {
ImageParticle {
id: stars
groups: ["stars"]
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
color: "white"
colorVariation: 0.1
alpha: 0
@@ -96,7 +96,7 @@ Rectangle {
ImageParticle {
id: shot
groups: ["shot"]
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
color: "#0FF06600"
colorVariation: 0.3
@@ -104,7 +104,7 @@ Rectangle {
ImageParticle {
id: engine
groups: ["engine"]
- source: "../../images/particle4.png"
+ source: "qrc:///particleresources/fuzzydot.png"
color: "orange"
SequentialAnimation on color {
diff --git a/examples/quick/particles/affectors/content/groupgoal.qml b/examples/quick/particles/affectors/content/groupgoal.qml
index 19fa041288..cf4361eb94 100644
--- a/examples/quick/particles/affectors/content/groupgoal.qml
+++ b/examples/quick/particles/affectors/content/groupgoal.qml
@@ -124,7 +124,7 @@ Rectangle {
id: smoke
anchors.fill: parent
groups: ["smoke"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
colorVariation: 0
color: "#00111111"
}
@@ -132,7 +132,7 @@ Rectangle {
id: pilot
anchors.fill: parent
groups: ["pilot"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
redVariation: 0.01
blueVariation: 0.4
color: "#0010004f"
diff --git a/examples/quick/particles/affectors/content/move.qml b/examples/quick/particles/affectors/content/move.qml
index b4d83318b0..e90f8c685c 100644
--- a/examples/quick/particles/affectors/content/move.qml
+++ b/examples/quick/particles/affectors/content/move.qml
@@ -50,7 +50,7 @@ Rectangle {
ImageParticle {
groups: ["A"]
anchors.fill: parent
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
color:"#FF1010"
redVariation: 0.8
}
@@ -80,7 +80,7 @@ Rectangle {
ImageParticle {
groups: ["B"]
anchors.fill: parent
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
color:"#10FF10"
greenVariation: 0.8
}
@@ -112,7 +112,7 @@ Rectangle {
ImageParticle {
groups: ["C"]
anchors.fill: parent
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
color:"#1010FF"
blueVariation: 0.8
}
diff --git a/examples/quick/particles/affectors/content/spritegoal.qml b/examples/quick/particles/affectors/content/spritegoal.qml
index 78b161f25b..ab108bb065 100644
--- a/examples/quick/particles/affectors/content/spritegoal.qml
+++ b/examples/quick/particles/affectors/content/spritegoal.qml
@@ -66,7 +66,7 @@ Item {
ImageParticle {
system: sys
groups: ["starfield"]
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
colorVariation: 0.3
color: "white"
}
@@ -170,7 +170,7 @@ Item {
z:0
system: sys
groups: ["exhaust"]
- source: "../../images/particle4.png"
+ source: "qrc:///particleresources/fuzzydot.png"
color: "orange"
SequentialAnimation on color {
diff --git a/examples/quick/particles/affectors/content/turbulence.qml b/examples/quick/particles/affectors/content/turbulence.qml
index d7a86039b4..eacedbe153 100644
--- a/examples/quick/particles/affectors/content/turbulence.qml
+++ b/examples/quick/particles/affectors/content/turbulence.qml
@@ -75,13 +75,13 @@ Rectangle {
ImageParticle {
groups: ["smoke"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
color: "#11111111"
colorVariation: 0
}
ImageParticle {
groups: ["flame"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
color: "#11ff400f"
colorVariation: 0.1
}
diff --git a/examples/quick/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml
index 130518a6f9..3fb4c9f378 100644
--- a/examples/quick/particles/customparticle/content/imagecolors.qml
+++ b/examples/quick/particles/customparticle/content/imagecolors.qml
@@ -71,7 +71,7 @@ Rectangle {
}
Image {
id: particle
- source: "../../images/particle4.png"
+ source: "qrc:///particleresources/fuzzydot.png"
}
//! [vertex]
vertexShader:"
diff --git a/examples/quick/particles/emitters/content/burstandpulse.qml b/examples/quick/particles/emitters/content/burstandpulse.qml
index 18d1c43933..28c56b326d 100644
--- a/examples/quick/particles/emitters/content/burstandpulse.qml
+++ b/examples/quick/particles/emitters/content/burstandpulse.qml
@@ -67,7 +67,7 @@ Rectangle {
id: particles
anchors.fill: parent
ImageParticle {
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
alpha: 0
colorVariation: 0.6
}
diff --git a/examples/quick/particles/emitters/content/customemitter.qml b/examples/quick/particles/emitters/content/customemitter.qml
index 966c78e70f..9ad504ebc8 100644
--- a/examples/quick/particles/emitters/content/customemitter.qml
+++ b/examples/quick/particles/emitters/content/customemitter.qml
@@ -90,7 +90,7 @@ ParticleSystem {
}
ImageParticle {
- source: "../../images/particle4.png"
+ source: "qrc:///particleresources/fuzzydot.png"
alpha: 0.0
}
}
diff --git a/examples/quick/particles/emitters/content/emitmask.qml b/examples/quick/particles/emitters/content/emitmask.qml
index 08c04f6e5f..1c2e7b458f 100644
--- a/examples/quick/particles/emitters/content/emitmask.qml
+++ b/examples/quick/particles/emitters/content/emitmask.qml
@@ -51,7 +51,7 @@ Rectangle {
anchors.centerIn: parent
ImageParticle {
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
z: 2
anchors.fill: parent
color: "#336666CC"
diff --git a/examples/quick/particles/emitters/content/maximumemitted.qml b/examples/quick/particles/emitters/content/maximumemitted.qml
index df92f05f4b..4bd9079770 100644
--- a/examples/quick/particles/emitters/content/maximumemitted.qml
+++ b/examples/quick/particles/emitters/content/maximumemitted.qml
@@ -53,7 +53,7 @@ Rectangle {
ImageParticle {
system: sys
id: cp
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
colorVariation: 0.4
color: "#000000FF"
}
diff --git a/examples/quick/particles/emitters/content/shapeanddirection.qml b/examples/quick/particles/emitters/content/shapeanddirection.qml
index 1dec5b2fa7..0ca433cfba 100644
--- a/examples/quick/particles/emitters/content/shapeanddirection.qml
+++ b/examples/quick/particles/emitters/content/shapeanddirection.qml
@@ -58,7 +58,7 @@ Rectangle {
ImageParticle {
groups: ["center","edge"]
anchors.fill: parent
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
colorVariation: 0.1
color: "#009999FF"
}
diff --git a/examples/quick/particles/emitters/content/trailemitter.qml b/examples/quick/particles/emitters/content/trailemitter.qml
index a4972b7b73..3186b511ef 100644
--- a/examples/quick/particles/emitters/content/trailemitter.qml
+++ b/examples/quick/particles/emitters/content/trailemitter.qml
@@ -56,7 +56,7 @@ Rectangle {
system: particles
anchors.fill: parent
groups: ["A", "B"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
colorVariation: 0
color: "#00111111"
}
@@ -65,7 +65,7 @@ Rectangle {
anchors.fill: parent
system: particles
groups: ["C", "D"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
colorVariation: 0.1
color: "#00ff400f"
}
diff --git a/examples/quick/particles/emitters/content/velocityfrommotion.qml b/examples/quick/particles/emitters/content/velocityfrommotion.qml
index 1f1d6607d0..d325f9b7e1 100644
--- a/examples/quick/particles/emitters/content/velocityfrommotion.qml
+++ b/examples/quick/particles/emitters/content/velocityfrommotion.qml
@@ -61,7 +61,7 @@ Rectangle {
ParticleSystem { id: sys1 }
ImageParticle {
system: sys1
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
color: "cyan"
alpha: 0
SequentialAnimation on color {
@@ -127,7 +127,7 @@ Rectangle {
}
}
colorVariation: 0.5
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
}
Emitter {
id: trailsStars
@@ -149,7 +149,7 @@ Rectangle {
}
ParticleSystem { id: sys3; }
ImageParticle {
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
system: sys3
color: "orange"
alpha: 0
@@ -191,7 +191,7 @@ Rectangle {
ParticleSystem { id: sys4; }
ImageParticle {
system: sys4
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
color: "green"
alpha: 0
SequentialAnimation on color {
diff --git a/examples/quick/particles/imageparticle/content/colored.qml b/examples/quick/particles/imageparticle/content/colored.qml
index 939ec7e437..236cc0f372 100644
--- a/examples/quick/particles/imageparticle/content/colored.qml
+++ b/examples/quick/particles/imageparticle/content/colored.qml
@@ -50,7 +50,7 @@ Rectangle {
ImageParticle {
groups: ["stars"]
anchors.fill: parent
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
}
Emitter {
group: "stars"
@@ -64,7 +64,7 @@ Rectangle {
// ![0]
ImageParticle {
anchors.fill: parent
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
alpha: 0
alphaVariation: 0.2
colorVariation: 1.0
diff --git a/examples/quick/particles/imageparticle/content/colortable.qml b/examples/quick/particles/imageparticle/content/colortable.qml
index 4090163872..87b5ae2678 100644
--- a/examples/quick/particles/imageparticle/content/colortable.qml
+++ b/examples/quick/particles/imageparticle/content/colortable.qml
@@ -55,7 +55,7 @@ Rectangle {
alpha: 0
//! [0]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
colorTable: "../../images/colortable.png"
sizeTable: "../../images/colortable.png"
//! [0]
diff --git a/examples/quick/particles/images.qrc b/examples/quick/particles/images.qrc
index 9f284a087d..1f754838a8 100644
--- a/examples/quick/particles/images.qrc
+++ b/examples/quick/particles/images.qrc
@@ -12,10 +12,8 @@
<file>images/meteor.png</file>
<file>images/meteors.png</file>
<file>images/nullRock.png</file>
- <file>images/particle.png</file>
<file>images/particle2.png</file>
<file>images/particle3.png</file>
- <file>images/particle4.png</file>
<file>images/particleA.png</file>
<file>images/portal_bg.png</file>
<file>images/realLeaf1.png</file>
@@ -27,7 +25,6 @@
<file>images/sizeInOut.png</file>
<file>images/snowflake.png</file>
<file>images/sparkleSize.png</file>
- <file>images/star.png</file>
<file>images/starfish_0.png</file>
<file>images/starfish_1.png</file>
<file>images/starfish_2.png</file>
diff --git a/examples/quick/particles/images/particle.png b/examples/quick/particles/images/particle.png
deleted file mode 100644
index 5c83896d22..0000000000
--- a/examples/quick/particles/images/particle.png
+++ /dev/null
Binary files differ
diff --git a/examples/quick/particles/images/particle4.png b/examples/quick/particles/images/particle4.png
deleted file mode 100644
index bc95b703c1..0000000000
--- a/examples/quick/particles/images/particle4.png
+++ /dev/null
Binary files differ
diff --git a/examples/quick/particles/images/star.png b/examples/quick/particles/images/star.png
deleted file mode 100644
index 0d592cfa87..0000000000
--- a/examples/quick/particles/images/star.png
+++ /dev/null
Binary files differ
diff --git a/examples/quick/particles/system/content/dynamiccomparison.qml b/examples/quick/particles/system/content/dynamiccomparison.qml
index 247a25a17d..9db7c0a1ec 100644
--- a/examples/quick/particles/system/content/dynamiccomparison.qml
+++ b/examples/quick/particles/system/content/dynamiccomparison.qml
@@ -52,7 +52,7 @@ Rectangle {
ImageParticle {
system: sys
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
color: "white"
colorVariation: 1.0
alpha: 0.1
@@ -90,7 +90,7 @@ Rectangle {
property int lifeSpan: 10000
width: 32
height: 32
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
y: 0
PropertyAnimation on y {from: -16; to: root.height-16; duration: container.lifeSpan; running: true}
SequentialAnimation on opacity {
diff --git a/examples/quick/particles/system/content/dynamicemitters.qml b/examples/quick/particles/system/content/dynamicemitters.qml
index 10ac33bd76..72ec1ffc23 100644
--- a/examples/quick/particles/system/content/dynamicemitters.qml
+++ b/examples/quick/particles/system/content/dynamicemitters.qml
@@ -51,7 +51,7 @@ Rectangle {
}
ImageParticle {
system: sys
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
color: "white"
colorVariation: 1.0
alpha: 0.1
diff --git a/examples/quick/particles/system/content/multiplepainters.qml b/examples/quick/particles/system/content/multiplepainters.qml
index 8a38874533..e0a1288588 100644
--- a/examples/quick/particles/system/content/multiplepainters.qml
+++ b/examples/quick/particles/system/content/multiplepainters.qml
@@ -91,6 +91,6 @@ Rectangle {
height: 240
width: root.width
z: 1
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
}
}
diff --git a/examples/quick/particles/system/content/startstop.qml b/examples/quick/particles/system/content/startstop.qml
index 5ce8729a43..e787919b05 100644
--- a/examples/quick/particles/system/content/startstop.qml
+++ b/examples/quick/particles/system/content/startstop.qml
@@ -69,7 +69,7 @@ Rectangle {
ImageParticle {
anchors.fill: parent
system: particles
- source: "../../images/star.png"
+ source: "qrc:///particleresources/star.png"
sizeTable: "../../images/sparkleSize.png"
alpha: 0
colorVariation: 0.6
diff --git a/examples/quick/particles/system/content/timedgroupchanges.qml b/examples/quick/particles/system/content/timedgroupchanges.qml
index 6443878a36..7131633769 100644
--- a/examples/quick/particles/system/content/timedgroupchanges.qml
+++ b/examples/quick/particles/system/content/timedgroupchanges.qml
@@ -119,7 +119,7 @@ Rectangle {
ImageParticle {
groups: ["works", "fire", "splode"]
- source: "../../images/particle.png"
+ source: "qrc:///particleresources/glowdot.png"
entryEffect: ImageParticle.Scale
}
}