Tilemap.addTilesetImage can now accept a BitmapData as the key parameter and will use the BitmapData to render the tileset with instead of an image from the cache (thanks to @unstoppablecarl for the idea phaserjs#1838)

Author: photonstorm

README.md

@@ -350,6 +350,7 @@ Version 2.4 - "Katar" - in dev
 * The LoadTexture component has a new property `customRender` which is checked for in the Core postUpdate to know when to render custom elements like Videos.
 * BitmapText line spacing and word wrapping has been vastly improved and bought in-line with how Pixi 3 handles it, but with additional anchor support.
 * P2.Body.loadPolygon now allows the `key` parameter to be passed as `null` - when this happens the `object` parameter can be the actual physics object data instead of a string pointing to the cache, allowing you to take advantage of adding multiple convex shapes with automatic adjustments for center of mass #1801
+* Tilemap.addTilesetImage can now accept a BitmapData as the `key` parameter and will use the BitmapData to render the tileset with instead of an image from the cache (thanks to @unstoppablecarl for the idea #1838)
 
 ### Bug Fixes
 

src/tilemap/Tilemap.js

@@ -243,7 +243,9 @@ Phaser.Tilemap.prototype = {
     *
     * @method Phaser.Tilemap#addTilesetImage
     * @param {string} tileset - The name of the tileset as specified in the map data.
-    * @param {string} [key] - The key of the Phaser.Cache image used for this tileset. If not specified it will look for an image with a key matching the tileset parameter.
+    * @param {string|Phaser.BitmapData} [key] - The key of the Phaser.Cache image used for this tileset.
+    *     If `undefined` or `null` it will look for an image with a key matching the tileset parameter.
+    *     You can also pass in a BitmapData which can be used instead of an Image.
     * @param {number} [tileWidth=32] - The width of the tiles in the Tileset Image. If not given it will default to the map.tileWidth value, if that isn't set then 32.
     * @param {number} [tileHeight=32] - The height of the tiles in the Tileset Image. If not given it will default to the map.tileHeight value, if that isn't set then 32.
     * @param {number} [tileMargin=0] - The width of the tiles in the Tileset Image. If not given it will default to the map.tileWidth value.
@@ -253,6 +255,7 @@ Phaser.Tilemap.prototype = {
     */
     addTilesetImage: function (tileset, key, tileWidth, tileHeight, tileMargin, tileSpacing, gid) {
 
+        if (typeof tileset === 'undefined') { return null; }
         if (typeof tileWidth === 'undefined') { tileWidth = this.tileWidth; }
         if (typeof tileHeight === 'undefined') { tileHeight = this.tileHeight; }
         if (typeof tileMargin === 'undefined') { tileMargin = 0; }
@@ -270,45 +273,44 @@ Phaser.Tilemap.prototype = {
             tileHeight = 32;
         }
 
-        if (typeof key === 'undefined')
+        var img = null;
+
+        if (typeof key === 'undefined' || key === null)
         {
-            if (typeof tileset === 'string')
-            {
-                key = tileset;
+            key = tileset;
+        }
 
-                if (!this.game.cache.checkImageKey(key))
-                {
-                    console.warn('Phaser.Tilemap.addTilesetImage: Invalid image key given: "' + key + '"');
-                    return null;
-                }
-            }
-            else
+        if (key instanceof Phaser.BitmapData)
+        {
+            img = key.canvas;
+        }
+        else
+        {
+            if (!this.game.cache.checkImageKey(key))
             {
+                console.warn('Phaser.Tilemap.addTilesetImage: Invalid image key given: "' + key + '"');
                 return null;
             }
+
+            img = this.game.cache.getImage(key);
         }
 
-        if (typeof tileset === 'string')
+        if (this.getTilesetIndex(tileset) === null && this.format === Phaser.Tilemap.TILED_JSON)
         {
-            tileset = this.getTilesetIndex(tileset);
-
-            if (tileset === null && this.format === Phaser.Tilemap.TILED_JSON)
-            {
-                console.warn('Phaser.Tilemap.addTilesetImage: No data found in the JSON matching the tileset name: "' + key + '"');
-                return null;
-            }
+            console.warn('Phaser.Tilemap.addTilesetImage: No data found in the JSON matching the tileset name: "' + key + '"');
+            return null;
         }
 
         if (this.tilesets[tileset])
         {
-            this.tilesets[tileset].setImage(this.game.cache.getImage(key));
+            this.tilesets[tileset].setImage(img);
             return this.tilesets[tileset];
         }
         else
         {
-            var newSet = new Phaser.Tileset(key, gid, tileWidth, tileHeight, tileMargin, tileSpacing, {});
+            var newSet = new Phaser.Tileset(tilset, gid, tileWidth, tileHeight, tileMargin, tileSpacing, {});
 
-            newSet.setImage(this.game.cache.getImage(key));
+            newSet.setImage(img);
 
             this.tilesets.push(newSet);