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.

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
+17 -8
View File
@@ -64,11 +64,11 @@ Phaser.TilemapParser = {
parse: function (game, data, format) {
if (format == Phaser.Tilemap.CSV)
if (format === Phaser.Tilemap.CSV)
{
return this.parseCSV(data);
}
else if (format == Phaser.Tilemap.TILED_JSON)
else if (format === Phaser.Tilemap.TILED_JSON)
{
return this.parseTiledJSON(data);
}
@@ -87,8 +87,9 @@ Phaser.TilemapParser = {
data = data.trim();
var output = [];
var rows = data.split("\n");
var height = rows.length;
var width = 0;
for (var i = 0; i < rows.length; i++)
{
@@ -100,9 +101,14 @@ Phaser.TilemapParser = {
{
output[i][c] = parseInt(column[c]);
}
if (width == 0)
{
width = column.length;
}
}
return [{ name: 'csv', alpha: 1, visible: true, tileMargin: 0, tileSpacing: 0, data: output }];
return [{ name: 'csv', width: width, height: height, alpha: 1, visible: true, tileMargin: 0, tileSpacing: 0, data: output }];
},
@@ -131,10 +137,13 @@ Phaser.TilemapParser = {
var layer = {
name: json.layers[i].name,
width: json.layers[i].width,
height: json.layers[i].height,
alpha: json.layers[i].opacity,
visible: json.layers[i].visible,
tileMargin: json.tilesets[0].margin,
tileSpacing: json.tilesets[0].spacing
tileSpacing: json.tilesets[0].spacing,
};
@@ -155,13 +164,13 @@ Phaser.TilemapParser = {
if (c == json.layers[i].width)
{
output.push(row);
// layer.addColumn(row);
c = 0;
}
}
layers.data = output;
this.layers.push(layer);
layer.data = output;
layers.push(layer);
}