From ab0ce4d3354050ab2d075fc81baa02f3bdec2526 Mon Sep 17 00:00:00 2001
From: Robert Kowalski <rgkmg25@gmail.com>
Date: Wed, 31 Jan 2024 11:34:21 -0500
Subject: [PATCH] CheckIsoBounds after checking if the iso tile will be visible

---
 changelog/3.80/CHANGELOG-v3.80.md             |  3 +-
 src/tilemaps/components/IsometricCullTiles.js | 80 ++++++++++---------
 2 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/changelog/3.80/CHANGELOG-v3.80.md b/changelog/3.80/CHANGELOG-v3.80.md
index 9db399093..d8d210ce2 100644
--- a/changelog/3.80/CHANGELOG-v3.80.md
+++ b/changelog/3.80/CHANGELOG-v3.80.md
@@ -10,7 +10,8 @@
 * The `dropped` argument has now been adeded to the documentation for the `DRAG_END` and `GAMEOBJECT_DRAG_END` events (thanks @samme)
 * `Container.onChildDestroyed` is a new internal method used to destroy Container children. Previously, if you destroyed a Game Object in an exclusive Container, the game object would (momentarily) move onto the Scene display list and emit an ADDED_TO_SCENE event. Also, if you added a Sprite to a non-exclusive Container and stopped the Scene, you would get a TypeError (evaluating 'this.anims.destroy'). This happened because the fromChild argument in the DESTROY event was misinterpreted as destroyChild in the Container's remove(), and the Container was calling the Sprite's destroy() again. (thanks @samme)
 * The `Text` and `TileSprite` Game Objects now place their textures into the global `TextureManager` and a `_textureKey` private string property has been added which contains a UUID to reference that texture.
-* `Tilemaps.Components.WeightedRandomize` now uses the Phaser `Math.RND.frac` method with a seed instead the `Math.Random` static method. (thanks @jorbascrumps)
+* `Tilemaps.Components.WeightedRandomize` now uses the Phaser `Math.RND.frac` method with a seed instead of the `Math.Random` static method. (thanks @jorbascrumps)
+* `Tilemaps.Components.IsometricCullTiles` does the `CheckIsoBounds` method check last when building the outputArray, as to help optimize in situations where the tile would not be visible anyways. (thanks @zegenie)
 
 # Bug Fixes
 
diff --git a/src/tilemaps/components/IsometricCullTiles.js b/src/tilemaps/components/IsometricCullTiles.js
index 4508c894b..b1fff6c05 100644
--- a/src/tilemaps/components/IsometricCullTiles.js
+++ b/src/tilemaps/components/IsometricCullTiles.js
@@ -50,17 +50,19 @@ var IsometricCullTiles = function (layer, camera, outputArray, renderOrder)
         {
             for (x = drawLeft; x < drawRight; x++)
             {
-                if (skipCull || CheckIsoBounds(x, y, layer, camera))
+                tile = mapData[y][x];
+
+                if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
-                    tile = mapData[y][x];
-
-                    if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
-                    {
-                        continue;
-                    }
-
-                    outputArray.push(tile);
+                    continue;
                 }
+
+                if (!skipCull && !CheckIsoBounds(x, y, layer, camera))
+                {
+                    continue;
+                }
+
+                outputArray.push(tile);
             }
         }
     }
@@ -72,17 +74,19 @@ var IsometricCullTiles = function (layer, camera, outputArray, renderOrder)
         {
             for (x = drawRight; x >= drawLeft; x--)
             {
-                if (skipCull || CheckIsoBounds(x, y, layer, camera))
+                tile = mapData[y][x];
+
+                if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
-                    tile = mapData[y][x];
-
-                    if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
-                    {
-                        continue;
-                    }
-
-                    outputArray.push(tile);
+                    continue;
                 }
+
+                if (!skipCull && !CheckIsoBounds(x, y, layer, camera))
+                {
+                    continue;
+                }
+
+                outputArray.push(tile);
             }
         }
     }
@@ -94,17 +98,19 @@ var IsometricCullTiles = function (layer, camera, outputArray, renderOrder)
         {
             for (x = drawLeft; x < drawRight; x++)
             {
-                if (skipCull || CheckIsoBounds(x, y, layer, camera))
+                tile = mapData[y][x];
+
+                if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
-                    tile = mapData[y][x];
-
-                    if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
-                    {
-                        continue;
-                    }
-
-                    outputArray.push(tile);
+                    continue;
                 }
+
+                if (!skipCull && !CheckIsoBounds(x, y, layer, camera))
+                {
+                    continue;
+                }
+
+                outputArray.push(tile);
             }
         }
     }
@@ -116,17 +122,19 @@ var IsometricCullTiles = function (layer, camera, outputArray, renderOrder)
         {
             for (x = drawRight; x >= drawLeft; x--)
             {
-                if (skipCull || CheckIsoBounds(x, y, layer, camera))
+                tile = mapData[y][x];
+
+                if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
                 {
-                    tile = mapData[y][x];
-
-                    if (!tile || tile.index === -1 || !tile.visible || tile.alpha === 0)
-                    {
-                        continue;
-                    }
-
-                    outputArray.push(tile);
+                    continue;
                 }
+
+                if (!skipCull && !CheckIsoBounds(x, y, layer, camera))
+                {
+                    continue;
+                }
+
+                outputArray.push(tile);
             }
         }
     }