Dynamic Layers support multiple tilesets now

Author: photonstorm

src/tilemaps/Tilemap.js

@@ -433,24 +433,20 @@ var Tilemap = new Class({
     },
 
     /**
-     * Creates a new and empty DynamicTilemapLayer. The currently selected layer in the map is set
-     * to this new layer.
+     * Creates a new and empty DynamicTilemapLayer. The currently selected layer in the map is set to this new layer.
      *
      * @method Phaser.Tilemaps.Tilemap#createBlankDynamicLayer
      * @since 3.0.0
      *
      * @param {string} name - The name of this layer. Must be unique within the map.
-     * @param {Phaser.Tilemaps.Tileset} tileset - The tileset the new layer will use.
+     * @param {(string|string[]|Phaser.Tilemaps.Tileset|Phaser.Tilemaps.Tileset[])} tileset - The tileset, or an array of tilesets, used to render this layer. Can be a string or a Tileset object.
      * @param {number} [x=0] - The world x position where the top left of this layer will be placed.
      * @param {number} [y=0] - The world y position where the top left of this layer will be placed.
-     * @param {integer} [width] - The width of the layer in tiles. If not specified, it will default
-     * to the map's width.
-     * @param {integer} [height] - The height of the layer in tiles. If not specified, it will default
-     * to the map's height.
-     * @param {integer} [tileWidth] - The width of the tiles the layer uses for calculations. If not
-     * specified, it will default to the map's tileWidth.
-     * @param {integer} [tileHeight] - The height of the tiles the layer uses for calculations. If not
-     * specified, it will default to the map's tileHeight.
+     * @param {integer} [width] - The width of the layer in tiles. If not specified, it will default to the map's width.
+     * @param {integer} [height] - The height of the layer in tiles. If not specified, it will default to the map's height.
+     * @param {integer} [tileWidth] - The width of the tiles the layer uses for calculations. If not specified, it will default to the map's tileWidth.
+     * @param {integer} [tileHeight] - The height of the tiles the layer uses for calculations. If not specified, it will default to the map's tileHeight.
+     * 
      * @return {?Phaser.Tilemaps.DynamicTilemapLayer} Returns the new layer was created, or null if it failed.
      */
     createBlankDynamicLayer: function (name, tileset, x, y, width, height, tileWidth, tileHeight)
@@ -466,7 +462,7 @@ var Tilemap = new Class({
 
         if (index !== null)
         {
-            console.warn('Cannot create blank layer: layer with matching name already exists ' + name);
+            console.warn('Invalid Tilemap Layer ID: ' + name);
             return null;
         }
 
@@ -493,6 +489,7 @@ var Tilemap = new Class({
         }
 
         this.layers.push(layerData);
+
         this.currentLayerIndex = this.layers.length - 1;
 
         var dynamicLayer = new DynamicTilemapLayer(this.scene, this, this.currentLayerIndex, tileset, x, y);
@@ -518,13 +515,10 @@ var Tilemap = new Class({
      * @method Phaser.Tilemaps.Tilemap#createDynamicLayer
      * @since 3.0.0
      *
-     * @param {(integer|string)} layerID - The layer array index value, or if a string is given, the
-     * layer name from Tiled.
-     * @param {Phaser.Tilemaps.Tileset} tileset - The tileset the new layer will use.
-     * @param {number} x - The x position to place the layer in the world. If not specified, it will
-     * default to the layer offset from Tiled or 0.
-     * @param {number} y - The y position to place the layer in the world. If not specified, it will
-     * default to the layer offset from Tiled or 0.
+     * @param {(integer|string)} layerID - The layer array index value, or if a string is given, the layer name from Tiled.
+     * @param {(string|string[]|Phaser.Tilemaps.Tileset|Phaser.Tilemaps.Tileset[])} tileset - The tileset, or an array of tilesets, used to render this layer. Can be a string or a Tileset object.
+     * @param {number} x - The x position to place the layer in the world. If not specified, it will default to the layer offset from Tiled or 0.
+     * @param {number} y - The y position to place the layer in the world. If not specified, it will default to the layer offset from Tiled or 0.
      *
      * @return {?Phaser.Tilemaps.DynamicTilemapLayer} Returns the new layer was created, or null if it failed.
      */
@@ -534,7 +528,7 @@ var Tilemap = new Class({
 
         if (index === null)
         {
-            console.warn('Cannot create Tilemap Layer, invalid ID: ' + layerID);
+            console.warn('Invalid Tilemap Layer ID: ' + layerID);
             return null;
         }
 
@@ -543,21 +537,13 @@ var Tilemap = new Class({
         // Check for an associated static or dynamic tilemap layer
         if (layerData.tilemapLayer)
         {
-            console.warn('Cannot create Tilemap Layer. ID: ' + layerID + ' already in use');
+            console.warn('Tilemap Layer ID already exists:' + layerID);
             return null;
         }
 
         this.currentLayerIndex = index;
 
-        // Make sure that all the LayerData & the tiles have the correct tile size. They usually
-        // are, but wouldn't match if you try to load a 2x or 4x res tileset when the map was made
-        // with a 1x res tileset.
-        if (layerData.tileWidth !== tileset.tileWidth || layerData.tileHeight !== tileset.tileHeight)
-        {
-            this.setLayerTileSize(tileset.tileWidth, tileset.tileHeight, index);
-        }
-
-        // Default the x/y position to match Tiled layer offset, if it exists.
+        //  Default the x/y position to match Tiled layer offset, if it exists.
         if (x === undefined && this.layers[index].x) { x = this.layers[index].x; }
         if (y === undefined && this.layers[index].y) { y = this.layers[index].y; }