Update SetCollision methods to track which indices have been set to collide

Author: mikewesthad

v3/src/gameobjects/tilemap/components/PutTileAt.js

@@ -32,6 +32,16 @@ var PutTileAt = function (tile, tileX, tileY, layer)
     }
 
     // TODO: collision & re-calculate faces
+    // 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();
+    }
 
     return layer.data[tileY][tileX];
 };

v3/src/gameobjects/tilemap/components/SetCollision.js

@@ -1,12 +1,20 @@
 var SetTileCollision = require('./SetTileCollision');
 var RecalculateFaces = require('./RecalculateFaces');
+var SetLayerCollisionIndex = require('./SetLayerCollisionIndex');
 
 var SetCollision = function (indexes, collides, recalculateFaces, layer)
 {
     if (collides === undefined) { collides = true; }
     if (recalculateFaces === undefined) { recalculateFaces = true; }
     if (!Array.isArray(indexes)) { indexes = [ indexes ]; }
 
+    // Update the array of colliding indexes
+    for (var i = 0; i < indexes.length; i++)
+    {
+        SetLayerCollisionIndex(indexes[i], collides, layer);
+    }
+
+    // Update the tiles
     for (var ty = 0; ty < layer.height; ty++)
     {
         for (var tx = 0; tx < layer.width; tx++)

v3/src/gameobjects/tilemap/components/SetCollisionBetween.js

@@ -1,5 +1,6 @@
 var SetTileCollision = require('./SetTileCollision');
 var RecalculateFaces = require('./RecalculateFaces');
+var SetLayerCollisionIndex = require('./SetLayerCollisionIndex');
 
 var SetCollisionBetween = function (start, stop, collides, recalculateFaces, layer)
 {
@@ -8,6 +9,13 @@ var SetCollisionBetween = function (start, stop, collides, recalculateFaces, lay
 
     if (start > stop) { return; }
 
+    // Update the array of colliding indexes
+    for (var index = start; index <= stop; index++)
+    {
+        SetLayerCollisionIndex(index, collides, layer);
+    }
+
+    // Update the tiles
     for (var ty = 0; ty < layer.height; ty++)
     {
         for (var tx = 0; tx < layer.width; tx++)

v3/src/gameobjects/tilemap/components/SetCollisionByExclusion.js

@@ -1,5 +1,6 @@
 var SetTileCollision = require('./SetTileCollision');
 var RecalculateFaces = require('./RecalculateFaces');
+var SetLayerCollisionIndex = require('./SetLayerCollisionIndex');
 
 var SetCollisionByExclusion = function (indexes, collides, recalculateFaces, layer)
 {
@@ -15,6 +16,7 @@ var SetCollisionByExclusion = function (indexes, collides, recalculateFaces, lay
             if (tile && indexes.indexOf(tile.index) === -1)
             {
                 SetTileCollision(tile, collides);
+                SetLayerCollisionIndex(tile.index, collides, layer);
             }
         }
     }

v3/src/gameobjects/tilemap/components/SetLayerCollisionIndex.js

@@ -0,0 +1,17 @@
+// Internal method
+// Update layer.collideIndexes to either contain or not contain tileIndex
+var SetLayerCollisionIndex = function (tileIndex, collides, layer)
+{
+    var loc = layer.collideIndexes.indexOf(tileIndex);
+
+    if (collides && loc === -1)
+    {
+        layer.collideIndexes.push(tileIndex);
+    }
+    else if (!collides && loc !== -1)
+    {
+        layer.collideIndexes.splice(loc, 1);
+    }
+};
+
+module.exports = SetLayerCollisionIndex;

v3/src/gameobjects/tilemap/mapdata/LayerData.js

@@ -22,6 +22,7 @@ var LayerData = new Class({
         this.visible = GetFastValue(config, 'visible', true);
         this.properties = GetFastValue(config, 'properties', {});
         this.indexes = GetFastValue(config, 'indexes', []);
+        this.collideIndexes = GetFastValue(config, 'collideIndexes', []);
         this.callbacks = GetFastValue(config, 'callbacks', []);
         this.bodies = GetFastValue(config, 'bodies', []);
         this.data = GetFastValue(config, 'data', []);