Replace Smiles with Starfish

And a bear.

Change-Id: I9809bca1664a7fe1aa6734edc986440b6ca2a63c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

diff --git a/examples/declarative/particles/customparticle/blurparticles.qml b/examples/declarative/particles/customparticle/blurparticles.qml
index 9767818..9a18be4 100644 (file)
--- a/examples/declarative/particles/customparticle/blurparticles.qml
+++ b/examples/declarative/particles/customparticle/blurparticles.qml
@@ -54,7 +54,7 @@ Rectangle {
         emitRate: 1
         lifeSpan: 12000
         speed: PointDirection {x:20;}
-        size: 64
+        size: 128
     }
     ShaderEffectSource {
         id: theSource
@@ -63,7 +63,7 @@ Rectangle {
     }
     Image {
         id: theItem
-        source: "../images/smile.png"
+        source: "../images/starfish_1.png"
     }
 
     CustomParticle {

diff --git a/examples/declarative/particles/customparticle/imagecolors.qml b/examples/declarative/particles/customparticle/imagecolors.qml
index 591fd24..0498631 100644 (file)
--- a/examples/declarative/particles/customparticle/imagecolors.qml
+++ b/examples/declarative/particles/customparticle/imagecolors.qml
@@ -62,7 +62,7 @@ Rectangle {
             }
             Image {
                 id: picture
-                source: "../images/smile.png"
+                source: "../images/starfish_3.png"
             }
             ShaderEffectSource {
                 id: particleSource
@@ -71,7 +71,7 @@ Rectangle {
             }
             Image {
                 id: particle
-                source: "../images/particle.png"
+                source: "../images/particle4.png"
             }
             vertexShader:"
                 uniform highp float maxWidth;
@@ -104,15 +104,15 @@ Rectangle {
             id: emitter
             system: sys
             enabled: false
-            lifeSpan: 4000
-            maximumEmitted: 1200
+            lifeSpan: 8000
+            maximumEmitted: 4000
             anchors.fill: parent
-            size: 32
-            speed: PointDirection { xVariation: 12; yVariation: 12 }
+            size: 16
+            acceleration: PointDirection { xVariation: 12; yVariation: 12 }
         }
         MouseArea {
             anchors.fill: parent
-            onClicked: emitter.burst(1200);
+            onClicked: emitter.burst(4000);
         }
     }
 }

diff --git a/examples/declarative/particles/emitters/emitmask.qml b/examples/declarative/particles/emitters/emitmask.qml
index 1703ab2..dad2f7a 100644 (file)
--- a/examples/declarative/particles/emitters/emitmask.qml
+++ b/examples/declarative/particles/emitters/emitmask.qml
@@ -64,7 +64,7 @@ Rectangle {
             lifeSpan: 720
             size: 10
             shape: MaskShape {
-                source: "../images/smileMask.png"
+                source: "../images/starfish_mask.png"
             }
         }
 

diff --git a/examples/declarative/particles/imageparticle/allatonce.qml b/examples/declarative/particles/imageparticle/allatonce.qml
index 0d5a11f..797a835 100644 (file)
--- a/examples/declarative/particles/imageparticle/allatonce.qml
+++ b/examples/declarative/particles/imageparticle/allatonce.qml
@@ -52,23 +52,9 @@ Rectangle {
     ImageParticle {
         sprites: [
             Sprite {
-                name: "licking"
-                source: "../images/squarefacewhite.png"
-                frames: 6
-                duration: 120
-                to: {"dying":1, "licking":5}
-            },
-            Sprite {
-                name: "dying"
-                source: "../images/squarefacewhiteX.png"
-                frames: 4
-                duration: 120
-                to: {"dead":1}
-            },
-            Sprite {
-                name: "dead"
-                source: "../images/squarefacewhiteXX.png"
-                frames: 1
+                name: "bear"
+                source: "../images/bear_tiles.png"
+                frames: 13
                 duration: 120
             }
         ]
@@ -90,8 +76,8 @@ Rectangle {
         emitRate: 200
         lifeSpan: 6000
         speed: AngleDirection {angleVariation: 360; magnitude: 80; magnitudeVariation: 40}
-        size: 40
-        endSize: 80
+        size: 60
+        endSize: 120
     }
 
     Text {

diff --git a/examples/declarative/particles/imageparticle/deformation.qml b/examples/declarative/particles/imageparticle/deformation.qml
index 989a699..5bd9f74 100644 (file)
--- a/examples/declarative/particles/imageparticle/deformation.qml
+++ b/examples/declarative/particles/imageparticle/deformation.qml
@@ -50,7 +50,7 @@ Rectangle {
     ImageParticle {
         system: sys
         groups: ["goingLeft", "goingRight"]
-        source: "../images/singlesmile.png"
+        source: "../images/starfish_4.png"
         rotation: 90
         rotationSpeed: 90
         autoRotation: true
@@ -58,7 +58,8 @@ Rectangle {
     ImageParticle {
         system: sys
         groups: ["goingDown"]
-        source: "../images/squarefacespriteXX.png"
+        source: "../images/starfish_0.png"
+        rotation: 180
         yVector: PointDirection { y: 0.5; yVariation: 0.25; xVariation: 0.25; }
     }
 
@@ -90,8 +91,8 @@ Rectangle {
         group: "goingRight"
         speed: PointDirection { x: 100 }
         lifeSpan: 4000
-        emitRate: 2
-        size: 32
+        emitRate: 1
+        size: 128
     }
     Emitter {
         id: emitB
@@ -102,8 +103,8 @@ Rectangle {
         group: "goingLeft"
         speed: PointDirection { x: -100 }
         lifeSpan: 4000
-        emitRate: 2
-        size: 32
+        emitRate: 1
+        size: 128
     }
     Emitter {
         id: emitC
@@ -114,7 +115,7 @@ Rectangle {
         group: "goingDown"
         speed: PointDirection { x: 100 }
         lifeSpan: 4000
-        emitRate: 2
-        size: 32
+        emitRate: 1
+        size: 128
     }
 }

diff --git a/examples/declarative/particles/imageparticle/rotation.qml b/examples/declarative/particles/imageparticle/rotation.qml
index fe77e43..d5a6e8d 100644 (file)
--- a/examples/declarative/particles/imageparticle/rotation.qml
+++ b/examples/declarative/particles/imageparticle/rotation.qml
@@ -49,20 +49,23 @@ Rectangle {
     ImageParticle {
         id: up
         system: sys
-        source: "../images/smile.png"
+        source: "../images/starfish_2.png"
     }
 
     Emitter {
         anchors.centerIn: parent
         system: sys
-        emitRate: 1000
-        size: 20
+        emitRate: 10
+        size: 200
         lifeSpan: 10000
         speed: AngleDirection {angleVariation: 360; magnitudeVariation: 100;}
     }
 
     MouseArea {
         anchors.fill: parent
-        onClicked: up.autoRotation = !up.autoRotation
+        onClicked: {
+            up.autoRotation = !up.autoRotation
+            up.rotation = up.autoRotation ? -90 : 0
+        }
     }
 }

diff --git a/examples/declarative/particles/imageparticle/sprites.qml b/examples/declarative/particles/imageparticle/sprites.qml
index ad18c48..dfc4447 100644 (file)
--- a/examples/declarative/particles/imageparticle/sprites.qml
+++ b/examples/declarative/particles/imageparticle/sprites.qml
@@ -42,69 +42,20 @@ import QtQuick 2.0
 import QtQuick.Particles 2.0
 
 Rectangle {
-    color: "goldenrod"
+    color: "lightsteelblue"
     width: 800
     height: 800
     id: root
 
     SpriteImage {
-        sprites: [Sprite {
-            name: "happy"
-            source: "../images/squarefacesprite2.png"
-            frames: 6
-            duration: 120
-            to: {"silly": 0.4, "sad": 0.2, "cyclops":0.1, "boggled":0.3, "dying":0.0}
-        }, Sprite {
-            name: "silly"
-            source: "../images/squarefacesprite.png"
-            frames: 6
-            duration: 120
-            to: {"love": 0.4, "happy": 0.1, "evil": 0.2, "cyclops":0.1, "boggled":0.2}
-        }, Sprite {
-            name: "sad"
-            source: "../images/squarefacesprite3.png"
-            frames: 6
-            duration: 120
-            to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.2, "boggled":0.2}
-        }, Sprite {
-            name: "cyclops"
-            source: "../images/squarefacesprite4.png"
-            frames: 6
-            duration: 120
-            to: {"love": 0.1, "evil": 0.1, "silly":0.1, "boggled":0.1, "cyclops" : 1.0}
-        }, Sprite {
-            name: "evil"
-            source: "../images/squarefacesprite5.png"
-            frames: 6
-            duration: 120
-            to: {"happy": 1.0}
-        }, Sprite {
-            name: "love"
-            source: "../images/squarefacesprite6.png"
-            frames: 6
-            duration: 120
-            to: {"sad": 0.6, "evil":0.4, "boggled":0.2}
-        }, Sprite {
-            name: "boggled"
-            source: "../images/squarefacesprite7.png"
-            frames: 6
-            duration: 120
-            to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.1, "sad":0.2}
-        }, Sprite {
-            name: "dying"
-            source: "../images/squarefacespriteX.png"
-            frames: 4
-            duration: 120
-            to: {"dead":1.0}
-        }, Sprite {
-            name: "dead"
-            source: "../images/squarefacespriteXX.png"
-            frames: 1
-            duration: 10000
-        }]
-
-        width: 100
-        height: 100
+        sprites: Sprite {
+                name: "bear"
+                source: "../images/bear_tiles.png"
+                frames: 13
+                duration: 120
+            }
+        width: 250
+        height: 250
         x: 20
         y: 20
         z:4
@@ -118,68 +69,38 @@ Rectangle {
         system: sys
         sprites: [Sprite {
             name: "happy"
-            source: "../images/squarefacesprite2.png"
-            frames: 6
-            duration: 120
-            to: {"silly": 0.4, "sad": 0.2, "cyclops":0.1, "boggled":0.3, "dying":0.0}
-        }, Sprite {
-            name: "silly"
-            source: "../images/squarefacesprite.png"
-            frames: 6
-            duration: 120
-            to: {"love": 0.4, "happy": 0.1, "evil": 0.2, "cyclops":0.1, "boggled":0.2}
-        }, Sprite {
-            name: "sad"
-            source: "../images/squarefacesprite3.png"
-            frames: 6
-            duration: 120
-            to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.2, "boggled":0.2}
-        }, Sprite {
-            name: "cyclops"
-            source: "../images/squarefacesprite4.png"
-            frames: 6
-            duration: 120
-            to: {"love": 0.1, "evil": 0.1, "silly":0.1, "boggled":0.1, "cyclops" : 1.0}
-        }, Sprite {
-            name: "evil"
-            source: "../images/squarefacesprite5.png"
-            frames: 6
-            duration: 120
-            to: {"happy": 1.0}
-        }, Sprite {
-            name: "love"
-            source: "../images/squarefacesprite6.png"
-            frames: 6
-            duration: 120
-            to: {"sad": 0.6, "evil":0.4, "boggled":0.2}
+            source: "../images/starfish_1.png"
+            frames: 1
+            duration: 260
+            to: {"happy": 1, "silly": 1, "angry": 1}
         }, Sprite {
-            name: "boggled"
-            source: "../images/squarefacesprite7.png"
-            frames: 6
-            duration: 120
-            to: {"love" : 0.2, "evil": 0.2, "silly": 0.2, "cyclops":0.1, "sad":0.2}
+            name: "angry"
+            source: "../images/starfish_0.png"
+            frames: 1
+            duration: 260
+            to: {"happy": 1, "silly": 1, "angry": 1}
         }, Sprite {
-            name: "dying"
-            source: "../images/squarefacespriteX.png"
-            frames: 4
-            duration: 120
-            to: {"dead":1.0}
+            name: "silly"
+            source: "../images/starfish_2.png"
+            frames: 1
+            duration: 260
+            to: {"happy": 1, "silly": 1, "noticedbear": 0}
         }, Sprite {
-            name: "dead"
-            source: "../images/squarefacespriteXX.png"
+            name: "noticedbear"
+            source: "../images/starfish_3.png"
             frames: 1
-            duration: 10000
+            duration: 2600
         }]
     }
 
     Emitter {
         system: sys
-        emitRate: 16
+        emitRate: 2
         lifeSpan: 10000
         speed: AngleDirection {angle: 90; magnitude: 60; angleVariation: 5}
         acceleration: PointDirection { y: 10 }
-        size: 30
-        sizeVariation: 10
+        size: 160
+        sizeVariation: 40
         width: parent.width
         height: 100
     }
@@ -189,6 +110,6 @@ Rectangle {
         width: root.width;
         height: root.height/2;
         y: root.height/2;
-        goalState:"dead"
+        goalState:"noticedbear"
     }
 }

diff --git a/examples/declarative/particles/images/bear_tiles.png b/examples/declarative/particles/images/bear_tiles.png
new file mode 100644 (file)
index 0000000..6bbb2a9
Binary files /dev/null and b/examples/declarative/particles/images/bear_tiles.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/allatonce.png b/examples/declarative/particles/images/launcherIcons/allatonce.png
index 0d87eea..b61d2d5 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/allatonce.png and b/examples/declarative/particles/images/launcherIcons/allatonce.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/blurparticles.png b/examples/declarative/particles/images/launcherIcons/blurparticles.png
index 7a247ae..4337f97 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/blurparticles.png and b/examples/declarative/particles/images/launcherIcons/blurparticles.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/deformation.png b/examples/declarative/particles/images/launcherIcons/deformation.png
index 78ea527..d1b722d 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/deformation.png and b/examples/declarative/particles/images/launcherIcons/deformation.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/emitmask.png b/examples/declarative/particles/images/launcherIcons/emitmask.png
index 5603964..e943a4a 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/emitmask.png and b/examples/declarative/particles/images/launcherIcons/emitmask.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/imagecolors.png b/examples/declarative/particles/images/launcherIcons/imagecolors.png
index f990e6c..0ff13a3 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/imagecolors.png and b/examples/declarative/particles/images/launcherIcons/imagecolors.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/rotation.png b/examples/declarative/particles/images/launcherIcons/rotation.png
index dd51498..6a8dbea 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/rotation.png and b/examples/declarative/particles/images/launcherIcons/rotation.png differ

diff --git a/examples/declarative/particles/images/launcherIcons/sprites.png b/examples/declarative/particles/images/launcherIcons/sprites.png
index dd01518..144216a 100644 (file)
Binary files a/examples/declarative/particles/images/launcherIcons/sprites.png and b/examples/declarative/particles/images/launcherIcons/sprites.png differ

diff --git a/examples/declarative/particles/images/singlesmile.png b/examples/declarative/particles/images/singlesmile.png
deleted file mode 100644 (file)
index 4087fa6..0000000
Binary files a/examples/declarative/particles/images/singlesmile.png and /dev/null differ

diff --git a/examples/declarative/particles/images/smile.png b/examples/declarative/particles/images/smile.png
deleted file mode 100644 (file)
index 3d66d72..0000000
Binary files a/examples/declarative/particles/images/smile.png and /dev/null differ

diff --git a/examples/declarative/particles/images/smileMask.png b/examples/declarative/particles/images/smileMask.png
deleted file mode 100644 (file)
index 65a0143..0000000
Binary files a/examples/declarative/particles/images/smileMask.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite.png b/examples/declarative/particles/images/squarefacesprite.png
deleted file mode 100644 (file)
index f9a5d5f..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite2.png b/examples/declarative/particles/images/squarefacesprite2.png
deleted file mode 100644 (file)
index 7106a52..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite2.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite3.png b/examples/declarative/particles/images/squarefacesprite3.png
deleted file mode 100644 (file)
index f4e6f26..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite3.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite4.png b/examples/declarative/particles/images/squarefacesprite4.png
deleted file mode 100644 (file)
index 1e094ee..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite4.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite5.png b/examples/declarative/particles/images/squarefacesprite5.png
deleted file mode 100644 (file)
index 1cfc5c7..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite5.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite6.png b/examples/declarative/particles/images/squarefacesprite6.png
deleted file mode 100644 (file)
index b040139..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite6.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacesprite7.png b/examples/declarative/particles/images/squarefacesprite7.png
deleted file mode 100644 (file)
index b1e5e4e..0000000
Binary files a/examples/declarative/particles/images/squarefacesprite7.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacespriteX.png b/examples/declarative/particles/images/squarefacespriteX.png
deleted file mode 100644 (file)
index 93a0181..0000000
Binary files a/examples/declarative/particles/images/squarefacespriteX.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacespriteXX.png b/examples/declarative/particles/images/squarefacespriteXX.png
deleted file mode 100644 (file)
index 3159efe..0000000
Binary files a/examples/declarative/particles/images/squarefacespriteXX.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacewhite.png b/examples/declarative/particles/images/squarefacewhite.png
deleted file mode 100644 (file)
index 02259c5..0000000
Binary files a/examples/declarative/particles/images/squarefacewhite.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacewhiteX.png b/examples/declarative/particles/images/squarefacewhiteX.png
deleted file mode 100644 (file)
index 59af205..0000000
Binary files a/examples/declarative/particles/images/squarefacewhiteX.png and /dev/null differ

diff --git a/examples/declarative/particles/images/squarefacewhiteXX.png b/examples/declarative/particles/images/squarefacewhiteXX.png
deleted file mode 100644 (file)
index b0f15c6..0000000
Binary files a/examples/declarative/particles/images/squarefacewhiteXX.png and /dev/null differ

diff --git a/examples/declarative/particles/images/starfish_0.png b/examples/declarative/particles/images/starfish_0.png
new file mode 100644 (file)
index 0000000..8747f02
Binary files /dev/null and b/examples/declarative/particles/images/starfish_0.png differ

diff --git a/examples/declarative/particles/images/starfish_1.png b/examples/declarative/particles/images/starfish_1.png
new file mode 100644 (file)
index 0000000..1f3f159
Binary files /dev/null and b/examples/declarative/particles/images/starfish_1.png differ

diff --git a/examples/declarative/particles/images/starfish_2.png b/examples/declarative/particles/images/starfish_2.png
new file mode 100644 (file)
index 0000000..c6c7e5a
Binary files /dev/null and b/examples/declarative/particles/images/starfish_2.png differ

diff --git a/examples/declarative/particles/images/starfish_3.png b/examples/declarative/particles/images/starfish_3.png
new file mode 100644 (file)
index 0000000..307a89f
Binary files /dev/null and b/examples/declarative/particles/images/starfish_3.png differ

diff --git a/examples/declarative/particles/images/starfish_4.png b/examples/declarative/particles/images/starfish_4.png
new file mode 100644 (file)
index 0000000..d61c265
Binary files /dev/null and b/examples/declarative/particles/images/starfish_4.png differ

diff --git a/examples/declarative/particles/images/starfish_mask.png b/examples/declarative/particles/images/starfish_mask.png
new file mode 100644 (file)
index 0000000..2ef74f9
Binary files /dev/null and b/examples/declarative/particles/images/starfish_mask.png differ