Consolidated gidMap creation

Author: photonstorm

src/tilemaps/staticlayer/StaticTilemapLayer.js

@@ -357,7 +357,6 @@ var StaticTilemapLayer = new Class({
         this.setOrigin();
         this.setSize(this.layer.tileWidth * this.layer.width, this.layer.tileHeight * this.layer.height);
 
-        this.updateIndexMap();
         this.updateVBOData();
 
         this.initPipeline('TextureTintPipeline');
@@ -382,6 +381,7 @@ var StaticTilemapLayer = new Class({
      */
     setTilesets: function (tilesets)
     {
+        var gidMap = [];
         var setList = [];
         var map = this.tilemap;
 
@@ -392,54 +392,28 @@ var StaticTilemapLayer = new Class({
 
         for (var i = 0; i < tilesets.length; i++)
         {
-            var key = tilesets[i];
-
-            if (typeof key === 'string')
-            {
-                var tileset = map.getTileset(key);
+            var tileset = tilesets[i];
 
-                if (tileset)
-                {
-                    setList.push(tileset);
-                }
-            }
-            else
+            if (typeof tileset === 'string')
             {
-                setList.push(key);
+                tileset = map.getTileset(tileset);
             }
-        }
 
-        this.tileset = setList;
-    },
-
-    /**
-     * Parses the tilesets that this Layer uses and constructs the
-     * tileset index map used during Canvas rendering.
-     *
-     * @method Phaser.Tilemaps.StaticTilemapLayer#updateIndexMap
-     * @private
-     * @since 3.14.0
-     *
-     * @return {this} This Tilemap Layer object.
-     */
-    updateIndexMap: function ()
-    {
-        var gidMap = [];
+            if (tileset)
+            {
+                setList.push(tileset);
 
-        this.tileset.forEach(function (singleSet)
-        {
-            var s = singleSet.firstgid;
+                var s = tileset.firstgid;
 
-            for (var i = 0; i < singleSet.total; i++)
-            {
-                gidMap[s + i] = singleSet;
+                for (var t = 0; t < tileset.total; t++)
+                {
+                    gidMap[s + t] = tileset;
+                }
             }
-    
-        });
+        }
 
         this.gidMap = gidMap;
-
-        return this;
+        this.tileset = setList;
     },
 
     /**