diff --git a/README.md b/README.md index 9ef26876d..328e77313 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ Version 2.0.6 - "Jornhill" - -in development- * Swapped to using escaped Unicode characters for the console output. * Frame.setTrim no longer modifies the Frame width and height values. * AnimationParser doesn't populate the Pixi.TextureCache for every frame any longer. Each display object has its own texture property instead. +* Removed the cacheKey parameters from the AnimationParser methods as they're no longer used. ### CocoonJS Specific Updates diff --git a/build/phaser.d.ts b/build/phaser.d.ts index 3eaef17d3..34e21cd59 100644 --- a/build/phaser.d.ts +++ b/build/phaser.d.ts @@ -1118,10 +1118,10 @@ declare module Phaser { class AnimationParser { - static JSONData(game: Phaser.Game, json: Object, cacheKey: string): Phaser.FrameData; - static JSONDataHash(game: Phaser.Game, json: Object, cacheKey: string): Phaser.FrameData; + static JSONData(game: Phaser.Game, json: Object): Phaser.FrameData; + static JSONDataHash(game: Phaser.Game, json: Object): Phaser.FrameData; static spriteSheet(game: Phaser.Game, key: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): Phaser.FrameData; - static XMLData(game: Phaser.Game, xml: Object, cacheKey: string): Phaser.FrameData; + static XMLData(game: Phaser.Game, xml: Object): Phaser.FrameData; } diff --git a/src/animation/AnimationParser.js b/src/animation/AnimationParser.js index 76b34addf..b578d95b0 100644 --- a/src/animation/AnimationParser.js +++ b/src/animation/AnimationParser.js @@ -94,10 +94,9 @@ Phaser.AnimationParser = { * @method Phaser.AnimationParser.JSONData * @param {Phaser.Game} game - A reference to the currently running game. * @param {Object} json - The JSON data from the Texture Atlas. Must be in Array format. - * @param {string} cacheKey - The Game.Cache asset key of the texture image. * @return {Phaser.FrameData} A FrameData object containing the parsed frames. */ - JSONData: function (game, json, cacheKey) { + JSONData: function (game, json) { // Malformed? if (!json['frames']) @@ -152,10 +151,9 @@ Phaser.AnimationParser = { * @method Phaser.AnimationParser.JSONDataHash * @param {Phaser.Game} game - A reference to the currently running game. * @param {Object} json - The JSON data from the Texture Atlas. Must be in JSON Hash format. - * @param {string} cacheKey - The Game.Cache asset key of the texture image. * @return {Phaser.FrameData} A FrameData object containing the parsed frames. */ - JSONDataHash: function (game, json, cacheKey) { + JSONDataHash: function (game, json) { // Malformed? if (!json['frames']) @@ -213,10 +211,9 @@ Phaser.AnimationParser = { * @method Phaser.AnimationParser.XMLData * @param {Phaser.Game} game - A reference to the currently running game. * @param {Object} xml - The XML data from the Texture Atlas. Must be in Starling XML format. - * @param {string} cacheKey - The Game.Cache asset key of the texture image. * @return {Phaser.FrameData} A FrameData object containing the parsed frames. */ - XMLData: function (game, xml, cacheKey) { + XMLData: function (game, xml) { // Malformed? if (!xml.getElementsByTagName('TextureAtlas'))