TilemapLayer.getTileX, getTileY and getTileXY all now required a Phaser.TilemapLayer (or Phaser.TilemapLayerGL) as the first argument.

Tilemap.getRayCastTiles now requires a Phaser.TilemapLayer (or Phaser.TilemapLayerGL) as the first argument.

Tilemap.getTiles now requires a Phaser.TilemapLayer (or Phaser.TilemapLayerGL) as the first argument.

Author: photonstorm

README.md

@@ -326,11 +326,14 @@ You can read all about the philosophy behind Lazer [here](http://phaser.io/news/
 * The Loader.headers object has a new property `requestedWith`. By default this is set to `false`, but it can be used to set the `X-Requested-With` header to `XMLHttpRequest` (or any other value you need). To enable this do `this.load.headers.requestedWith = 'XMLHttpRequest'` before adding anything to the Loader.
 * ScaleManager.hasPhaserSetFullScreen is a new boolean that identifies if the browser is in full screen mode or not, and if Phaser was the one that requested it. As it's possible to enter full screen mode outside of Phaser, and it then gets confused about what bounding parent to use.
 * Phaser.Tileset has a new property `lastgid` which is populated automatically by the TilemapParser when importing Tiled map data, or can be set manually if building your own tileset.
-* TilemapLayer.getRayCastTiles has been moved to Tilemap.getRayCastTiles.
 * TilemapLayer.rayStepRate has been moved to Tilemap.rayStepRate.
+* TilemapLayer.getRayCastTiles has been moved to Tilemap.getRayCastTiles.
 * TilemapLayer.getTiles has been moved to Tilemap.getTiles.
-* The private methods `TilemapLayer._fixX`, `_unfixX`, `_fixY` and `_unfixY` have been moved to `Tilemap.
-* TilemapLayer.getTileX, getTileY and getTileXY have been moved to Tilemap, and work off the current layer.
+* The private methods `TilemapLayer._fixX`, `_unfixX`, `_fixY` and `_unfixY` have been moved to the Tilemap class.
+* TilemapLayer.getTileX, getTileY and getTileXY have been moved to the Tilemap class.
+* TilemapLayer.getTileX, getTileY and getTileXY all now required a Phaser.TilemapLayer (or Phaser.TilemapLayerGL) as the first argument.
+* Tilemap.getRayCastTiles now requires a Phaser.TilemapLayer (or Phaser.TilemapLayerGL) as the first argument.
+* Tilemap.getTiles now requires a Phaser.TilemapLayer (or Phaser.TilemapLayerGL) as the first argument.
 
 ### Bug Fixes
 

src/tilemap/Tilemap.js

@@ -2000,14 +2000,14 @@ Phaser.Tilemap.prototype = {
     * @param {boolean} [interestingFace=false] - If true, _only_ return tiles that have interesting faces.
     * @return {Phaser.Tile[]} An array of Phaser.Tiles.
     */
-    getRayCastTiles: function (line, stepRate, collides, interestingFace) {
+    getRayCastTiles: function (layer, line, stepRate, collides, interestingFace) {
 
         if (!stepRate) { stepRate = this.rayStepRate; }
         if (collides === undefined) { collides = false; }
         if (interestingFace === undefined) { interestingFace = false; }
 
         //  First get all tiles that touch the bounds of the line
-        var tiles = this.getTiles(line.x, line.y, line.width, line.height, collides, interestingFace);
+        var tiles = this.getTiles(layer, line.x, line.y, line.width, line.height, collides, interestingFace);
 
         if (tiles.length === 0)
         {
@@ -2054,7 +2054,7 @@ Phaser.Tilemap.prototype = {
     * @param {boolean} [interestingFace=false] - If true, _only_ return tiles that have interesting faces.
     * @return {array<Phaser.Tile>} An array of Tiles.
     */
-    getTiles: function (x, y, width, height, collides, interestingFace) {
+    getTiles: function (layer, x, y, width, height, collides, interestingFace) {
 
         //  Should we only get tiles that have at least one of their collision flags set? (true = yes, false = no just get them all)
 
@@ -2063,11 +2063,9 @@ Phaser.Tilemap.prototype = {
 
         var fetchAll = !(collides || interestingFace);
 
-        var layer = this.layer;
-
         //  Adjust the x,y coordinates for scrollFactor
-        x = layer._fixX(x);
-        y = layer._fixY(y);
+        x = layer._fixX(layer, x);
+        y = layer._fixY(layer, y);
 
         //  Convert the pixel values into tile coordinates
         var tx = Math.floor(x / (layer._mc.cw * layer.scale.x));
@@ -2107,9 +2105,7 @@ Phaser.Tilemap.prototype = {
     * @param {number} x - x coordinate in camera space
     * @return {number} x coordinate in scrollFactor-adjusted dimensions
     */
-    _fixX: function (x) {
-
-        var layer = this.layer;
+    _fixX: function (layer, x) {
 
         if (layer.scrollFactorX === 1 || (layer.scrollFactorX === 0 && layer.position.x === 0))
         {
@@ -2134,9 +2130,7 @@ Phaser.Tilemap.prototype = {
     * @param {number} x - x coordinate in scrollFactor-adjusted dimensions
     * @return {number} x coordinate in camera space
     */
-    _unfixX: function (x) {
-
-        var layer = this.layer;
+    _unfixX: function (layer, x) {
 
         if (layer.scrollFactorX === 1)
         {
@@ -2155,9 +2149,7 @@ Phaser.Tilemap.prototype = {
     * @param {number} y - y coordinate in camera space
     * @return {number} y coordinate in scrollFactor-adjusted dimensions
     */
-    _fixY: function (y) {
-
-        var layer = this.layer;
+    _fixY: function (layer, y) {
 
         if (layer.scrollFactorY === 1 || (layer.scrollFactorY === 0 && layer.position.y === 0))
         {
@@ -2182,9 +2174,7 @@ Phaser.Tilemap.prototype = {
     * @param {number} y - y coordinate in scrollFactor-adjusted dimensions
     * @return {number} y coordinate in camera space
     */
-    _unfixY: function (y) {
-
-        var layer = this.layer;
+    _unfixY: function (layer, y) {
 
         if (layer.scrollFactorY === 1)
         {
@@ -2202,11 +2192,9 @@ Phaser.Tilemap.prototype = {
     * @param {number} x - X position of the point in target tile (in pixels).
     * @return {integer} The X map location of the tile.
     */
-    getTileX: function (x) {
-
-        var layer = this.layer;
+    getTileX: function (layer, x) {
 
-        return Math.floor(this._fixX(x) / layer._mc.tileWidth);
+        return Math.floor(this._fixX(layer, x) / layer._mc.tileWidth);
 
     },
 
@@ -2217,11 +2205,9 @@ Phaser.Tilemap.prototype = {
     * @param {number} y - Y position of the point in target tile (in pixels).
     * @return {integer} The Y map location of the tile.
     */
-    getTileY: function (y) {
-
-        var layer = this.layer;
+    getTileY: function (layer, y) {
 
-        return Math.floor(this._fixY(y) / layer._mc.tileHeight);
+        return Math.floor(this._fixY(layer, y) / layer._mc.tileHeight);
 
     },
 
@@ -2234,10 +2220,10 @@ Phaser.Tilemap.prototype = {
     * @param {(Phaser.Point|object)} point - The Point/object to update.
     * @return {(Phaser.Point|object)} A Point/object with its `x` and `y` properties set.
     */
-    getTileXY: function (x, y, point) {
+    getTileXY: function (layer, x, y, point) {
 
-        point.x = this.getTileX(x);
-        point.y = this.getTileY(y);
+        point.x = this.getTileX(layer, x);
+        point.y = this.getTileY(layer, y);
 
         return point;