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

Merge pull request #329 from lucasmonteverde/dev

Browse source 
Custom JSON loader
This commit is contained in:
Richard Davey 2014-02-21 18:42:01 +00:00
commit 529d210006
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/loader/Loader.js
View file

@ -368,6 +368,22 @@ Phaser.Loader.prototype = {
return this;
},
/**
* Add a custom JSON file to the Loader.
*
* @method Phaser.Loader#json
* @param {string} key - Unique asset key of the json file.
* @param {string} url - URL of the json file.
* @return {Phaser.Loader} This Loader instance.
*/
json: function (key, url) {
this.addToFileList('json', key, url);
return this;
},
/**
* Add a binary file to the Loader. It will be loaded via xhr with a responseType of "arraybuffer". You can specify an optional callback to process the file after load.
@ -826,12 +842,12 @@ Phaser.Loader.prototype = {
}
break;
case 'tilemap':
case 'json':
this._xhr.open("GET", this.baseURL + file.url, true);
this._xhr.responseType = "text";
if (file.format === Phaser.Tilemap.TILED_JSON)
if (!file.format || file.format === Phaser.Tilemap.TILED_JSON)
{
this._xhr.onload = function () {
return _this.jsonLoadComplete(_this._fileIndex);
@ -853,7 +869,6 @@ Phaser.Loader.prototype = {
};
this._xhr.send();
break;
case 'text':
case 'script':
this._xhr.open("GET", this.baseURL + file.url, true);
@ -1112,6 +1127,10 @@ Phaser.Loader.prototype = {
{
this.game.cache.addTilemap(file.key, file.url, data, file.format);
}
else if (file.type === 'json')
{
this.game.cache.addText(file.key, file.url, data);
}
else
{
this.game.cache.addTextureAtlas(file.key, file.url, file.data, data, file.format);