Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-24 05:33:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Pavle Goloskokovic 2017-11-30 14:39:33 +01:00
commit 5f21646e6c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
v3/src/gameobjects/tilemap/Tilemap.js
View file

@ -306,7 +306,8 @@ var Tilemap = new Class({
row = []; row = [];
for (var tileX = 0; tileX < width; tileX++) for (var tileX = 0; tileX < width; tileX++)
{ {
row.push(new Tile(layerData, -1, tileX, tileY, tileWidth, tileHeight)); row.push(new Tile(layerData, -1, tileX, tileY, tileWidth, tileHeight,
this.tileWidth, this.tileHeight));
} }
layerData.data.push(row); layerData.data.push(row);
} }

8
v3/src/gameobjects/tilemap/components/CullTiles.js
View file

@ -30,10 +30,10 @@ var CullTiles = function (layer, camera, outputArray)
if (tile === null || (tile.index <= 0 && tilemapLayer.skipIndexZero)) { continue; } if (tile === null || (tile.index <= 0 && tilemapLayer.skipIndexZero)) { continue; }
var tileX = tile.x * tileWidth - left; var tileX = tile.worldX - left;
var tileY = tile.y * tileHeight - top; var tileY = tile.worldY - top;
var cullW = camera.width + tileWidth; var cullW = camera.width + tile.width;
var cullH = camera.height + tileHeight; var cullH = camera.height + tile.height;
if (tile.visible && if (tile.visible &&
tileX > -tileWidth && tileY > -tileHeight && tileX > -tileWidth && tileY > -tileHeight &&