diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-02-14 18:16:21 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 09:19:40 +0100 |
commit | 75a0d33d250a97d5ee0314f5b7aad876d9ee2fa8 (patch) | |
tree | 6d90ab5b35158ddc4b0c8d6343eec17bbceee641 /examples/particles | |
parent | f7dae3960b2ab6f5db3a79e3ea701f2531b909d7 (diff) |
Rename SpriteImage to SpriteSequence
Also rename Sprite::frames->Sprite::frameCount
Change-Id: I2e7a71adc37044fd696ffda2a5da4835725ba3a8
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'examples/particles')
-rw-r--r-- | examples/particles/affectors/age.qml | 2 | ||||
-rw-r--r-- | examples/particles/affectors/attractor.qml | 2 | ||||
-rw-r--r-- | examples/particles/affectors/customaffector.qml | 10 | ||||
-rw-r--r-- | examples/particles/affectors/friction.qml | 10 | ||||
-rw-r--r-- | examples/particles/affectors/spritegoal.qml | 6 | ||||
-rw-r--r-- | examples/particles/affectors/wander.qml | 2 | ||||
-rw-r--r-- | examples/particles/imageparticle/allatonce.qml | 2 | ||||
-rw-r--r-- | examples/particles/imageparticle/sprites.qml | 12 |
8 files changed, 23 insertions, 23 deletions
diff --git a/examples/particles/affectors/age.qml b/examples/particles/affectors/age.qml index 1e7774b63b..ea1b30275e 100644 --- a/examples/particles/affectors/age.qml +++ b/examples/particles/affectors/age.qml @@ -54,7 +54,7 @@ Rectangle { sprites: Sprite { name: "snow" source: "../images/snowflake.png" - frames: 51 + frameCount: 51 frameDuration: 40 frameDurationVariation: 8 } diff --git a/examples/particles/affectors/attractor.qml b/examples/particles/affectors/attractor.qml index 460a497a92..0d50937fe7 100644 --- a/examples/particles/affectors/attractor.qml +++ b/examples/particles/affectors/attractor.qml @@ -108,7 +108,7 @@ Rectangle { id: spinState name: "spinning" source: "../images/meteor.png" - frames: 35 + frameCount: 35 frameDuration: 60 } } diff --git a/examples/particles/affectors/customaffector.qml b/examples/particles/affectors/customaffector.qml index 3f98cd5b43..9ccf45d3e6 100644 --- a/examples/particles/affectors/customaffector.qml +++ b/examples/particles/affectors/customaffector.qml @@ -135,31 +135,31 @@ Item { system: sys sprites: [Sprite { source: "../images/realLeaf1.png" - frames: 1 + frameCount: 1 frameDuration: 1 to: {"a":1, "b":1, "c":1, "d":1} }, Sprite { name: "a" source: "../images/realLeaf1.png" - frames: 1 + frameCount: 1 frameDuration: 10000 }, Sprite { name: "b" source: "../images/realLeaf2.png" - frames: 1 + frameCount: 1 frameDuration: 10000 }, Sprite { name: "c" source: "../images/realLeaf3.png" - frames: 1 + frameCount: 1 frameDuration: 10000 }, Sprite { name: "d" source: "../images/realLeaf4.png" - frames: 1 + frameCount: 1 frameDuration: 10000 } ] diff --git a/examples/particles/affectors/friction.qml b/examples/particles/affectors/friction.qml index 4161fd9f02..b93ead1967 100644 --- a/examples/particles/affectors/friction.qml +++ b/examples/particles/affectors/friction.qml @@ -65,31 +65,31 @@ Item { system: sys sprites: [Sprite { source: "../images/realLeaf1.png" - frames: 1 + frameCount: 1 frameDuration: 1 to: {"a":1, "b":1, "c":1, "d":1} }, Sprite { name: "a" source: "../images/realLeaf1.png" - frames: 1 + frameCount: 1 frameDuration: 10000 }, Sprite { name: "b" source: "../images/realLeaf2.png" - frames: 1 + frameCount: 1 frameDuration: 10000 }, Sprite { name: "c" source: "../images/realLeaf3.png" - frames: 1 + frameCount: 1 frameDuration: 10000 }, Sprite { name: "d" source: "../images/realLeaf4.png" - frames: 1 + frameCount: 1 frameDuration: 10000 } ] diff --git a/examples/particles/affectors/spritegoal.qml b/examples/particles/affectors/spritegoal.qml index 1ea61442aa..7102d09bc2 100644 --- a/examples/particles/affectors/spritegoal.qml +++ b/examples/particles/affectors/spritegoal.qml @@ -105,20 +105,20 @@ Item { id: spinState name: "spinning" source: "../images/meteor.png" - frames: 35 + frameCount: 35 frameDuration: 40 randomStart: true to: {"explode":0, "spinning":1} },Sprite { name: "explode" source: "../images/_explo.png" - frames: 22 + frameCount: 22 frameDuration: 40 to: {"nullFrame":1} },Sprite {//Not sure if this is needed, but seemed easiest name: "nullFrame" source: "../images/nullRock.png" - frames: 1 + frameCount: 1 frameDuration: 1000 } ] diff --git a/examples/particles/affectors/wander.qml b/examples/particles/affectors/wander.qml index 31a0b4a796..ea008795c2 100644 --- a/examples/particles/affectors/wander.qml +++ b/examples/particles/affectors/wander.qml @@ -51,7 +51,7 @@ Rectangle { sprites: Sprite { name: "snow" source: "../images/snowflake.png" - frames: 51 + frameCount: 51 frameDuration: 40 frameDurationVariation: 8 } diff --git a/examples/particles/imageparticle/allatonce.qml b/examples/particles/imageparticle/allatonce.qml index fbc634ec9a..b62735d7f9 100644 --- a/examples/particles/imageparticle/allatonce.qml +++ b/examples/particles/imageparticle/allatonce.qml @@ -54,7 +54,7 @@ Rectangle { Sprite { name: "bear" source: "../images/bear_tiles.png" - frames: 13 + frameCount: 13 frameDuration: 120 } ] diff --git a/examples/particles/imageparticle/sprites.qml b/examples/particles/imageparticle/sprites.qml index 0fe4f31ea3..45ff2ebbaf 100644 --- a/examples/particles/imageparticle/sprites.qml +++ b/examples/particles/imageparticle/sprites.qml @@ -47,11 +47,11 @@ Rectangle { height: 800 id: root - SpriteImage { + SpriteSequence { sprites: Sprite { name: "bear" source: "../images/bear_tiles.png" - frames: 13 + frameCount: 13 frameDuration: 120 } width: 250 @@ -71,25 +71,25 @@ Rectangle { sprites: [Sprite { name: "happy" source: "../images/starfish_1.png" - frames: 1 + frameCount: 1 frameDuration: 260 to: {"happy": 1, "silly": 1, "angry": 1} }, Sprite { name: "angry" source: "../images/starfish_0.png" - frames: 1 + frameCount: 1 frameDuration: 260 to: {"happy": 1, "silly": 1, "angry": 1} }, Sprite { name: "silly" source: "../images/starfish_2.png" - frames: 1 + frameCount: 1 frameDuration: 260 to: {"happy": 1, "silly": 1, "noticedbear": 0} }, Sprite { name: "noticedbear" source: "../images/starfish_3.png" - frames: 1 + frameCount: 1 frameDuration: 2600 }] } |