Fixed renderer so it draws multi tileset isometric tiles properly

Author: photonstorm

src/tilemaps/dynamiclayer/DynamicTilemapLayerWebGLRenderer.js

@@ -46,66 +46,53 @@ var DynamicTilemapLayerWebGLRenderer = function (renderer, src, camera)
     var sx = src.scaleX;
     var sy = src.scaleY;
 
-    var tilesets = src.tileset;
-
-    //  Loop through each tileset in this layer, drawing just the tiles that are in that set each time
-    //  Doing it this way around allows us to batch tiles using the same tileset
-    for (var c = 0; c < tilesets.length; c++)
+    for (var i = 0; i < tileCount; i++)
     {
-        var currentSet = tilesets[c];
-        var texture = currentSet.glTexture;
+        var tile = renderTiles[i];
+
+        var tileset = gidMap[tile.index];
+
+        var texture = tileset.glTexture;
+
         var textureUnit = pipeline.setTexture2D(texture, src);
 
-        for (var i = 0; i < tileCount; i++)
+        var tileTexCoords = tileset.getTileTextureCoordinates(tile.index);
+
+        if (tileTexCoords === null)
         {
-            var tile = renderTiles[i];
-
-            var tileset = gidMap[tile.index];
-
-            if (tileset !== currentSet)
-            {
-                //  Skip tiles that aren't in this set
-                continue;
-            }
-
-            var tileTexCoords = tileset.getTileTextureCoordinates(tile.index);
-
-            if (tileTexCoords === null)
-            {
-                continue;
-            }
-
-            var frameWidth = tileset.tileWidth;
-            var frameHeight = tileset.tileHeight;
-
-            var frameX = tileTexCoords.x;
-            var frameY = tileTexCoords.y;
-
-            var tw = tileset.tileWidth * 0.5;
-            var th = tileset.tileHeight * 0.5;
-
-            var tint = getTint(tile.tint, alpha * tile.alpha);
-
-            pipeline.batchTexture(
-                src,
-                texture,
-                texture.width, texture.height,
-                x + ((tw + tile.pixelX) * sx), y + ((th + tile.pixelY) * sy),
-                tile.width, tile.height,
-                sx, sy,
-                tile.rotation,
-                tile.flipX, tile.flipY,
-                scrollFactorX, scrollFactorY,
-                tw, th,
-                frameX, frameY, frameWidth, frameHeight,
-                tint, tint, tint, tint, false,
-                0, 0,
-                camera,
-                null,
-                true,
-                textureUnit
-            );
+            continue;
         }
+
+        var frameWidth = tileset.tileWidth;
+        var frameHeight = tileset.tileHeight;
+
+        var frameX = tileTexCoords.x;
+        var frameY = tileTexCoords.y;
+
+        var tw = tileset.tileWidth * 0.5;
+        var th = tileset.tileHeight * 0.5;
+
+        var tint = getTint(tile.tint, alpha * tile.alpha);
+
+        pipeline.batchTexture(
+            src,
+            texture,
+            texture.width, texture.height,
+            x + ((tw + tile.pixelX) * sx), y + ((th + tile.pixelY) * sy),
+            tile.width, tile.height,
+            sx, sy,
+            tile.rotation,
+            tile.flipX, tile.flipY,
+            scrollFactorX, scrollFactorY,
+            tw, th,
+            frameX, frameY, frameWidth, frameHeight,
+            tint, tint, tint, tint, false,
+            0, 0,
+            camera,
+            null,
+            true,
+            textureUnit
+        );
     }
 };