Fix phaserjs#3169: add optional param to Tile#setCollision & Tile.resetCollision to recalc faces

Author: mikewesthad

src/gameobjects/tilemap/Tile.js

@@ -402,10 +402,14 @@ var Tile = new Class({
     /**
      * Reset collision status flags.
      *
+     * @param {boolean} [recalculateFaces=true] - Whether or not to recalculate interesting faces
+     * for this tile and its neighbors.
      * @returns {this}
      */
-    resetCollision: function ()
+    resetCollision: function (recalculateFaces)
     {
+        if (recalculateFaces === undefined) { recalculateFaces = true; }
+
         this.collideLeft = false;
         this.collideRight = false;
         this.collideUp = false;
@@ -416,6 +420,15 @@ var Tile = new Class({
         this.faceLeft = false;
         this.faceRight = false;
 
+        if (recalculateFaces)
+        {
+            var tilemapLayer = this.tilemapLayer;
+            if (tilemapLayer)
+            {
+                this.tilemapLayer.calculateFacesAt(this.x, this.y);
+            }
+        }
+
         return this;
     },
 
@@ -441,13 +454,16 @@ var Tile = new Class({
      * @param {boolean} right - Indicating collide with any object on the right.
      * @param {boolean} up - Indicating collide with any object on the top.
      * @param {boolean} down - Indicating collide with any object on the bottom.
+     * @param {boolean} [recalculateFaces=true] - Whether or not to recalculate interesting faces
+     * for this tile and its neighbors.
      * @returns {this}
      */
-    setCollision: function (left, right, up, down)
+    setCollision: function (left, right, up, down, recalculateFaces)
     {
         if (right === undefined) { right = left; }
         if (up === undefined) { up = left; }
         if (down === undefined) { down = left; }
+        if (recalculateFaces === undefined) { recalculateFaces = true; }
 
         this.collideLeft = left;
         this.collideRight = right;
@@ -459,6 +475,15 @@ var Tile = new Class({
         this.faceTop = up;
         this.faceBottom = down;
 
+        if (recalculateFaces)
+        {
+            var tilemapLayer = this.tilemapLayer;
+            if (tilemapLayer)
+            {
+                this.tilemapLayer.calculateFacesAt(this.x, this.y);
+            }
+        }
+
         return this;
     },
 

src/gameobjects/tilemap/components/Fill.js

@@ -1,5 +1,6 @@
 var GetTilesWithin = require('./GetTilesWithin');
 var CalculateFacesWithin = require('./CalculateFacesWithin');
+var SetTileCollision = require('./SetTileCollision');
 
 /**
  * Sets the tiles in the given rectangular area (in tile coordinates) of the layer with the
@@ -25,14 +26,7 @@ var Fill = function (index, tileX, tileY, width, height, recalculateFaces, layer
     {
         tiles[i].index = index;
 
-        if (doesIndexCollide)
-        {
-            tiles[i].setCollision(true);
-        }
-        else
-        {
-            tiles[i].resetCollision();
-        }
+        SetTileCollision(tiles[i], doesIndexCollide);
     }
 
     if (recalculateFaces)

src/gameobjects/tilemap/components/PutTileAt.js

@@ -1,6 +1,7 @@
 var Tile = require('../Tile');
 var IsInLayerBounds = require('./IsInLayerBounds');
 var CalculateFacesAt = require('./CalculateFacesAt');
+var SetTileCollision = require('./SetTileCollision');
 
 /**
  * Puts a tile at the given tile coordinates in the specified layer. You can pass in either an index
@@ -46,14 +47,8 @@ var PutTileAt = function (tile, tileX, tileY, recalculateFaces, layer)
 
     // Updating colliding flag on the new tile
     var newTile = layer.data[tileY][tileX];
-    if (layer.collideIndexes.indexOf(newTile.index) !== -1)
-    {
-        newTile.setCollision(true);
-    }
-    else
-    {
-        newTile.resetCollision();
-    }
+    var collides = layer.collideIndexes.indexOf(newTile.index) !== -1;
+    SetTileCollision(newTile, collides);
 
     // Recalculate faces only if the colliding flag at (tileX, tileY) has changed
     if (recalculateFaces && (oldTileCollides !== newTile.collides))

src/gameobjects/tilemap/components/SetTileCollision.js

@@ -1,5 +1,6 @@
 /**
- * Internally used method to set the colliding state of a tile.
+ * Internally used method to set the colliding state of a tile. This does not recalculate
+ * interesting faces.
  *
  * @param {Tile} tile - [description]
  * @param {boolean} [collides=true] - [description]
@@ -8,11 +9,11 @@ var SetTileCollision = function (tile, collides)
 {
     if (collides)
     {
-        tile.setCollision(true, true, true, true);
+        tile.setCollision(true, true, true, true, false);
     }
     else
     {
-        tile.resetCollision();
+        tile.resetCollision(false);
     }
 };