Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-27 23:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed createInternalLayer loop.

Browse source
This commit is contained in:
Richard Davey 2016-07-20 16:24:06 +01:00
parent cff28860fa
commit 49fb798f60
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tilemap/Tilemap.js
View file

@ -615,11 +615,11 @@ Phaser.Tilemap.prototype = {
} }
// Create the internal layers for different tilesets using this one as a base description // Create the internal layers for different tilesets using this one as a base description
for (var i = 1, l = this.tilesets.length; i < l; i++) for (var i = 1; i < this.tilesets.length; i++)
{ {
var ts = this.tilesets[i]; var ts = this.tilesets[i];
var li = this.layers[index]; var li = this.layers[index];
this.createInternalLayer("_internal" + i.toString(), ts, li.width, li.height, ts.tileWidth, ts.tileHeight, group); this.createInternalLayer('layer' + index + '_internal_' + i.toString(), ts, li.width, li.height, ts.tileWidth, ts.tileHeight, group);
} }
if (this.game.renderType === Phaser.WEBGL) if (this.game.renderType === Phaser.WEBGL)
@ -692,18 +692,22 @@ Phaser.Tilemap.prototype = {
for (var y = 0; y < height; y++) for (var y = 0; y < height; y++)
{ {
row = []; row = [];
for (var x = 0; x < width; x++) for (var x = 0; x < width; x++)
{ {
// get the equivalent tile from this Tilemap // get the equivalent tile from this Tilemap
var tile = this.layers[0].data[y][x]; var tile = this.layers[0].data[y][x];
// find out which tileset it is in // find out which tileset it is in
var setIndex = this.tiles[tile.index] && this.tiles[tile.index][2]; var setIndex = this.tiles[tile.index] && this.tiles[tile.index][2];
var ts = this.tilesets[setIndex]; var ts = this.tilesets[setIndex];
// is it one of the ones we want to move? // is it one of the ones we want to move?
if ( ts == tileset ) if (ts === tileset)
{ {
// move the tile to this new layer // move the tile to this new layer
row.push( tile ); row.push( tile );
// erase it from the original (mixed tileset) layer // erase it from the original (mixed tileset) layer
this.layers[0].data[y][x] = new Phaser.Tile(layer, -1, x, y, tileWidth, tileHeight); this.layers[0].data[y][x] = new Phaser.Tile(layer, -1, x, y, tileWidth, tileHeight);
} }
@ -735,7 +739,8 @@ Phaser.Tilemap.prototype = {
} }
var output; var output;
if ( this.game.renderType === Phaser.WEBGL )
if (this.game.renderType === Phaser.WEBGL)
{ {
output = new Phaser.TilemapLayerGL(this.game, this, this.layers.length - 1, w, h); output = new Phaser.TilemapLayerGL(this.game, this, this.layers.length - 1, w, h);
} }
@ -743,6 +748,7 @@ Phaser.Tilemap.prototype = {
{ {
output = new Phaser.TilemapLayer(this.game, this, this.layers.length - 1, w, h); output = new Phaser.TilemapLayer(this.game, this, this.layers.length - 1, w, h);
} }
output.name = name; output.name = name;
return group.add(output); return group.add(output);