Implemented tile & layer callbacks in arcade physics

Author: mikewesthad

src/physics/arcade/inc/CollideSpriteVsTilemapLayer.js

@@ -34,7 +34,7 @@ var CollideSpriteVsTilemapLayer = function (sprite, tilemapLayer, collideCallbac
 
         if (TileIntersectsBody(tileWorldRect, body)
             && (!processCallback || processCallback.call(callbackContext, sprite, tile))
-            && ProcessTileCallbacks(tile)
+            && ProcessTileCallbacks(tile, sprite)
             && (overlapOnly || SeparateTile(i, body, tile, tileWorldRect, tilemapLayer, this.TILE_BIAS)))
         {
             this._total++;

src/physics/arcade/inc/tilemap/ProcessTileCallbacks.js

@@ -1,20 +1,18 @@
-var ProcessTileCallbacks = function (tile)
+var ProcessTileCallbacks = function (tile, sprite)
 {
-    return true;
+    // Tile callbacks take priority over layer level callbacks
+    if (tile.collisionCallback)
+    {
+        return !tile.collisionCallback.call(tile.collisionCallbackContext, sprite, tile);
+    }
+    else if (tile.layer.callbacks[tile.index])
+    {
+        return !tile.layer.callbacks[tile.index].callback.call(
+            tile.layer.callbacks[tile.index].callbackContext, sprite, tile
+        );
+    }
 
-    // TODO: port v2
-    // //  Tilemap & tile callbacks take priority
-    // //  A local callback always takes priority over a layer level callback
-    // if (tile.collisionCallback && !tile.collisionCallback.call(tile.collisionCallbackContext, body.sprite, tile))
-    // {
-    //     //  If it returns true then we can carry on, otherwise we should abort.
-    //     return false;
-    // }
-    // else if (typeof tile.layer.callbacks !== 'undefined' && tile.layer.callbacks[tile.index] && !tile.layer.callbacks[tile.index].callback.call(tile.layer.callbacks[tile.index].callbackContext, body.sprite, tile))
-    // {
-    //     //  If it returns true then we can carry on, otherwise we should abort.
-    //     return false;
-    // }
+    return true;
 };
 
 module.exports = ProcessTileCallbacks;