Merge pull request phaserjs#1642 from zekoff/tileset-render-fix

photonstorm · photonstorm · commit c819f0b508e1 · 2015-02-26T21:28:21.000Z
Fix row/col count formula.
diff --git a/src/tilemap/Tileset.js b/src/tilemap/Tileset.js
@@ -214,8 +214,8 @@ Phaser.Tileset.prototype = {
     updateTileData: function (imageWidth, imageHeight) {
 
         // May be fractional values
-        var rowCount = (imageHeight - this.tileMargin) / (this.tileHeight + this.tileSpacing);
-        var colCount = (imageWidth - this.tileMargin) / (this.tileWidth + this.tileSpacing);
+        var rowCount = (imageHeight - this.tileMargin * 2 + this.tileSpacing) / (this.tileHeight + this.tileSpacing);
+        var colCount = (imageWidth - this.tileMargin * 2 + this.tileSpacing) / (this.tileWidth + this.tileSpacing);
 
         if (rowCount % 1 !== 0 || colCount % 1 !== 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,8 @@ Phaser.Tileset.prototype = {`
`214`	`214`	`updateTileData: function (imageWidth, imageHeight) {`
`215`	`215`
`216`	`216`	`// May be fractional values`
`217`		`- var rowCount = (imageHeight - this.tileMargin) / (this.tileHeight + this.tileSpacing);`
`218`		`- var colCount = (imageWidth - this.tileMargin) / (this.tileWidth + this.tileSpacing);`
	`217`	`+ var rowCount = (imageHeight - this.tileMargin * 2 + this.tileSpacing) / (this.tileHeight + this.tileSpacing);`
	`218`	`+ var colCount = (imageWidth - this.tileMargin * 2 + this.tileSpacing) / (this.tileWidth + this.tileSpacing);`
`219`	`219`
`220`	`220`	`if (rowCount % 1 !== 0 \|\| colCount % 1 !== 0)`
`221`	`221`	`{`