Updated AnimationParser and fixed LoadTexture calls.

Author: photonstorm

README.md

@@ -392,6 +392,7 @@ For the full list of p2 additions please read [their change log](https://github.
 * Added Phaser.Keyboard.COMMA and Phaser.Keyboard.PERIOD to the consts list.
 * Canvas.setSmoothingEnabled only applies the value of the property exists, which avoids the Chrome webkit prefix deprecation warnings.
 * PIXI._CompileShader can now take an array or a string for the fragment src.
+* AnimationParser.spriteSheet can now accept either a string-based key or an HTML Image object as the key argument.
 
 ### Bug Fixes
 

src/animation/AnimationParser.js

@@ -17,20 +17,24 @@ Phaser.AnimationParser = {
     *
     * @method Phaser.AnimationParser.spriteSheet
     * @param {Phaser.Game} game - A reference to the currently running game.
-    * @param {string} key - The Game.Cache asset key of the Sprite Sheet image.
+    * @param {string|Image} key - The Game.Cache asset key of the Sprite Sheet image or an actual HTML Image element.
     * @param {number} frameWidth - The fixed width of each frame of the animation.
     * @param {number} frameHeight - The fixed height of each frame of the animation.
-    * @param {number} [frameMax=-1] - The total number of animation frames to extact from the Sprite Sheet. The default value of -1 means "extract all frames".
+    * @param {number} [frameMax=-1] - The total number of animation frames to extract from the Sprite Sheet. The default value of -1 means "extract all frames".
     * @param {number} [margin=0] - If the frames have been drawn with a margin, specify the amount here.
     * @param {number} [spacing=0] - If the frames have been drawn with spacing between them, specify the amount here.
     * @return {Phaser.FrameData} A FrameData object containing the parsed frames.
     */
     spriteSheet: function (game, key, frameWidth, frameHeight, frameMax, margin, spacing) {
 
-        //  How big is our image?
-        var img = game.cache.getImage(key);
+        var img = key;
 
-        if (img == null)
+        if (typeof key === 'string')
+        {
+            img = game.cache.getImage(key);
+        }
+
+        if (img === null)
         {
             return null;
         }

src/gameobjects/components/LoadTexture.js

@@ -92,28 +92,8 @@ Phaser.Component.LoadTexture.prototype = {
 
             this.key = img.key;
             this.setTexture(new PIXI.Texture(img.base));
-            
-            setFrame = !this.animations.loadFrameData(cache.getFrameData(this.key), frame);
-
-            // if (key === null || key === undefined)
-            // {
-            //     this.key = '__default';
-            //     // this.setTexture(PIXI.TextureCache[this.key]);
-            //     this.setTexture(cache.getTexture(this.key));
-            // }
-            // else if (typeof key === 'string' && !cache.checkImageKey(key))
-            // {
-            //     console.warn("Texture with key '" + key + "' not found.");
-            //     this.key = '__missing';
-            //     // this.setTexture(PIXI.TextureCache[this.key]);
-            //     this.setTexture(cache.getTexture(this.key));
-            // }
-            // else
-            // {
-            //     this.setTexture(new PIXI.Texture(PIXI.BaseTextureCache[key]));
-
-                // setFrame = !this.animations.loadFrameData(cache.getFrameData(key), frame);
-            // }
+
+            setFrame = !this.animations.loadFrameData(img.frameData, frame);
         }
 
         if (setFrame)

src/loader/Cache.js

@@ -566,7 +566,7 @@ Phaser.Cache.prototype = {
             margin: margin, 
             spacing: spacing,
             base: new PIXI.BaseTexture(data),
-            frameData: Phaser.AnimationParser.spriteSheet(this.game, key, frameWidth, frameHeight, frameMax, margin, spacing)
+            frameData: Phaser.AnimationParser.spriteSheet(this.game, data, frameWidth, frameHeight, frameMax, margin, spacing)
         };
 
         this._cache.image[key] = obj;