Implement proper sprite sheet functionality

Uses frameX/frameY from the new Sprite API. You can now specify your
sprites as a single sprite sheet and just specify the offset for
individual animations.

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

7 files changed, 12 insertions, 5 deletions

diff --git a/examples/declarative/imageelements/content/Bear0.png b/examples/declarative/imageelements/content/Bear0.png
deleted file mode 100644
index 64a02cec8e..0000000000
--- a/examples/declarative/imageelements/content/Bear0.png
+++ /dev/null
diff --git a/examples/declarative/imageelements/content/Bear1.png b/examples/declarative/imageelements/content/Bear1.png
deleted file mode 100644
index 3b88f3b32e..0000000000
--- a/examples/declarative/imageelements/content/Bear1.png
+++ /dev/null
diff --git a/examples/declarative/imageelements/content/Bear2.png b/examples/declarative/imageelements/content/Bear2.png
deleted file mode 100644
index 337b636070..0000000000
--- a/examples/declarative/imageelements/content/Bear2.png
+++ /dev/null
diff --git a/examples/declarative/imageelements/content/Bear3.png b/examples/declarative/imageelements/content/Bear3.png
deleted file mode 100644
index f0e68590f4..0000000000
--- a/examples/declarative/imageelements/content/Bear3.png
+++ /dev/null
diff --git a/examples/declarative/imageelements/content/BearB.png b/examples/declarative/imageelements/content/BearB.png
deleted file mode 100644
index c9a84ae1d4..0000000000
--- a/examples/declarative/imageelements/content/BearB.png
+++ /dev/null
diff --git a/examples/declarative/imageelements/content/BearSheet.png b/examples/declarative/imageelements/content/BearSheet.png
new file mode 100644
index 0000000000..a084bf0f1e
--- /dev/null
+++ b/examples/declarative/imageelements/content/BearSheet.png
diff --git a/examples/declarative/imageelements/spriteimage.qml b/examples/declarative/imageelements/spriteimage.qml
index bace7ef7e2..d64589aea9 100644
--- a/examples/declarative/imageelements/spriteimage.qml
+++ b/examples/declarative/imageelements/spriteimage.qml
@@ -62,7 +62,7 @@ Item {
         goalSprite: ""
         Sprite{
             name: "still"
-            source: "content/Bear0.png"
+            source: "content/BearSheet.png"
             frames: 1
             frameWidth: 256
             frameHeight: 256
@@ -71,8 +71,10 @@ Item {
         }
         Sprite{
             name: "blink"
-            source: "content/BearB.png"
+            source: "content/BearSheet.png"
             frames: 3
+            frameX: 256
+            frameY: 1536
             frameWidth: 256
             frameHeight: 256
             frameDuration: 100
@@ -80,8 +82,10 @@ Item {
         }
         Sprite{
             name: "floating"
-            source: "content/Bear1.png"
+            source: "content/BearSheet.png"
             frames: 9
+            frameX: 0
+            frameY: 0
             frameWidth: 256
             frameHeight: 256
             frameDuration: 160
@@ -89,8 +93,10 @@ Item {
         }
         Sprite{
             name: "flailing"
-            source: "content/Bear2.png"
+            source: "content/BearSheet.png"
             frames: 8
+            frameX: 0
+            frameY: 768
             frameWidth: 256
             frameHeight: 256
             frameDuration: 160
@@ -98,8 +104,9 @@ Item {
         }
         Sprite{
             name: "falling"
-            source: "content/Bear3.png"
+            source: "content/BearSheet.png"
             frames: 5
+            frameY: 1280
             frameWidth: 256
             frameHeight: 256
             frameDuration: 160