wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-07-17 11:31:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

And Tilemaps are rendering again - and much better than ever before :) Just one final optimisation pass to do and then it's on to collision.

Browse Source
This commit is contained in:
photonstorm
2013-10-11 18:18:27 +01:00
parent cf414394c3
commit 0201baef11
10 changed files with 304 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loader/Cache.js
+4 -4
View File
@@ -156,9 +156,9 @@ Phaser.Cache.prototype = {
*/
addTilemap: function (key, url, mapData, format) {
this._tilemaps[key] = { url: url, mapData: mapData, format: format };
this._tilemaps[key] = { url: url, data: mapData, format: format };
this._tilemaps[key].mapData = Phaser.TilemapParser.parse(this.game, mapData, format);
this._tilemaps[key].layers = Phaser.TilemapParser.parse(this.game, mapData, format);
},
@@ -453,9 +453,9 @@ Phaser.Cache.prototype = {
*
* @method Phaser.Cache#getTilemap
* @param {string} key - Asset key of the tilemap you want.
* @return {Phaser.Tilemap} The tilemap data. The tileset image is in the data property, the map data in mapData.
* @return {Object} The tilemap data. The tileset image is in the data property, the map data in mapData.
*/
getTilemap: function (key) {
getTilemapData: function (key) {
if (this._tilemaps[key])
{
src/loader/Loader.js
+2 -2
View File
@@ -371,7 +371,7 @@ Phaser.Loader.prototype = {
break;
// An xml string or object has been given
case Phaser.Tilemap.JSON:
case Phaser.Tilemap.TILED_JSON:
if (typeof mapData === 'string')
{
@@ -710,7 +710,7 @@ Phaser.Loader.prototype = {
this._xhr.open("GET", this.baseURL + file.url, true);
this._xhr.responseType = "text";
if (file.format == Phaser.Tilemap.JSON)
if (file.format == Phaser.Tilemap.TILED_JSON)
{
this._xhr.onload = function () {
return _this.jsonLoadComplete(file.key);