Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-26 22:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check for new TP3 structure.

Browse source
This commit is contained in:
Richard Davey 2018-02-09 15:22:55 +00:00
parent 33a67f3aff
commit 3225367240
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/textures/TextureManager.js
View file

@ -277,9 +277,8 @@ var TextureManager = new Class({
*/ */
addAtlas: function (key, source, data) addAtlas: function (key, source, data)
{ {
// Is it a Hash or an Array? // New Texture Packer format?
if (Array.isArray(data.textures) || Array.isArray(data.frames))
if (Array.isArray(data.frames))
{ {
return this.addAtlasJSONArray(key, source, data); return this.addAtlasJSONArray(key, source, data);
} }

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

@ -16,9 +16,9 @@ var Clone = require('../../utils/object/Clone');
var JSONArray = function (texture, sourceIndex, json) var JSONArray = function (texture, sourceIndex, json)
{ {
// Malformed? // Malformed?
if (!json['frames']) if (!json['frames'] && !json['textures'])
{ {
console.warn('Invalid Texture Atlas JSON Array given, missing \'frames\' array'); console.warn('Invalid Texture Atlas JSON Array given, missing \'frames\' and \'textures\' array');
return; return;
} }
@ -28,7 +28,8 @@ var JSONArray = function (texture, sourceIndex, json)
texture.add('__BASE', sourceIndex, 0, 0, source.width, source.height); texture.add('__BASE', sourceIndex, 0, 0, source.width, source.height);
// By this stage frames is a fully parsed array // By this stage frames is a fully parsed array
var frames = json['frames']; var frames = (Array.isArray(json.textures)) ? json.textures[0].frames : json.frames;
var newFrame; var newFrame;
for (var i = 0; i < frames.length; i++) for (var i = 0; i < frames.length; i++)
@ -57,6 +58,13 @@ var JSONArray = function (texture, sourceIndex, json)
newFrame.updateUVsInverted(); newFrame.updateUVsInverted();
} }
if (src.anchor)
{
newFrame.customPivot = true;
newFrame.pivotX = src.anchor.x;
newFrame.pivotY = src.anchor.y;
}
// Copy over any extra data // Copy over any extra data
newFrame.customData = Clone(src); newFrame.customData = Clone(src);
} }