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

some cleaning up and documentation polish

Browse source
This commit is contained in:
Josh McGhee 2015-09-01 01:03:51 +01:00
parent cbd7265bee
commit 4a19aca212
3 changed files with 169 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/animation/AnimationParser.js
View file

@ -147,9 +147,7 @@ Phaser.AnimationParser = {
/**
* Parse the JSON data and extract the animation frame data from it.
*
<<<<<<< HEAD
=======
* @method Phaser.AnimationParser.JSONData
* @method Phaser.AnimationParser.JSONDataPyxel
* @param {Phaser.Game} game - A reference to the currently running game.
* @param {object} json - The JSON data from the Texture Atlas. Must be in Pyxel JSON format.
* @return {Phaser.FrameData} A FrameData object containing the parsed frames.
@ -205,7 +203,6 @@ Phaser.AnimationParser = {
/**
* Parse the JSON data and extract the animation frame data from it.
*
>>>>>>> 247064f... fixed some typos and explicitly setTrim to false
* @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.

3
src/loader/Cache.js
View file

@ -604,13 +604,10 @@ Phaser.Cache.prototype = {
{
obj.frameData = Phaser.AnimationParser.XMLData(this.game, atlasData, key);
}
<<<<<<< HEAD
=======
else if (format === Phaser.Loader.TEXTURE_ATLAS_JSON_PYXEL)
{
obj.frameData = Phaser.AnimationParser.JSONDataPyxel(this.game, atlasData, key);
}
>>>>>>> 247064f... fixed some typos and explicitly setTrim to false
else
{
// Let's just work it out from the frames array

3
src/loader/Loader.js
View file

@ -296,15 +296,12 @@ Phaser.Loader.TEXTURE_ATLAS_XML_STARLING = 2;
* @constant
* @type {number}
*/
<<<<<<< HEAD
=======
Phaser.Loader.TEXTURE_ATLAS_JSON_PYXEL = 3;
/**
* @constant
* @type {number}
*/
>>>>>>> 247064f... fixed some typos and explicitly setTrim to false
Phaser.Loader.PHYSICS_LIME_CORONA_JSON = 3;
/**