Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-17 06:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed JSON Hash parsing.

Browse source
This commit is contained in:
photonstorm 2016-10-19 14:29:52 +01:00
parent 0a659bcf67
commit 4f8e509f91
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/loader/Cache.js
View file

@ -699,9 +699,10 @@ Phaser.Cache.prototype = {
texture: null
};
if (Array.isArray(atlasData.frames) && format === Phaser.Loader.TEXTURE_ATLAS_JSON_HASH)
// If they (or Phaser) set the JSON Format to ARRAY, but it's an Object, then switch it
if (!Array.isArray(atlasData.frames) && format === Phaser.Loader.TEXTURE_ATLAS_JSON_ARRAY)
{
format = Phaser.Loader.TEXTURE_ATLAS_JSON_ARRAY;
format = Phaser.Loader.TEXTURE_ATLAS_JSON_HASH;
}
var manager = this.game.textures;

3
src/textures/parsers/JSONArray.js
View file

@ -18,8 +18,7 @@ Phaser.TextureManager.Parsers.JSONArray = function (texture, sourceIndex, json)
// Malformed?
if (!json['frames'])
{
// console.warn("Phaser.AnimationParser.JSONData: Invalid Texture Atlas JSON given, missing 'frames' array");
// console.log(json);
console.warn('Invalid Texture Atlas JSON Array given, missing \'frames\' array');
return;
}

11
src/textures/parsers/JSONHash.js
View file

@ -13,17 +13,16 @@
* @param {object} json - The JSON data from the Texture Atlas. Must be in JSON Hash format.
* @return {Phaser.FrameData} A FrameData object containing the parsed frames.
*/
Phaser.TextureManager.Parsers.JSONHash = function (texture, json)
Phaser.TextureManager.Parsers.JSONHash = function (texture, sourceIndex, json)
{
// Malformed?
if (!json['frames'])
{
// console.warn("Phaser.AnimationParser.JSONDataHash: Invalid Texture Atlas JSON given, missing 'frames' object");
// console.log(json);
console.warn('Invalid Texture Atlas JSON Hash given, missing \'frames\' Object');
return;
}
// By this stage frames is a fully parsed array
// By this stage frames is a fully parsed Object
var frames = json['frames'];
var newFrame;
@ -32,7 +31,7 @@ Phaser.TextureManager.Parsers.JSONHash = function (texture, json)
var src = frames[key];
// The frame values are the exact coordinates to cut the frame out of the atlas from
newFrame = texture.add(key, src.frame.x, src.frame.y, src.frame.w, src.frame.h);
newFrame = texture.add(key, sourceIndex, src.frame.x, src.frame.y, src.frame.w, src.frame.h);
// These are the original (non-trimmed) sprite values
if (src.trimmed)
@ -53,5 +52,5 @@ Phaser.TextureManager.Parsers.JSONHash = function (texture, json)
}
}
return data;
return texture;
};