From ca9c8e6cfd0dc301de0f99e86adcfa369726b421 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Mon, 30 Jan 2023 22:38:15 +0100
Subject: [PATCH] Improved RuntimeTexturePacker speed when using many distinct
 texture sizes

---
 CHANGELOG.md                      | 4 ++++
 MLEM.Data/RuntimeTexturePacker.cs | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 999122a..5a6d429 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ Jump to version:
 
 ## 6.2.0 (In Development)
 
+### MLEM.Data
+Improvements
+- Improved RuntimeTexturePacker speed when using many distinct texture sizes
+
 ## 6.1.0
 
 ### MLEM
diff --git a/MLEM.Data/RuntimeTexturePacker.cs b/MLEM.Data/RuntimeTexturePacker.cs
index 97d6dec..a0cdc40 100644
--- a/MLEM.Data/RuntimeTexturePacker.cs
+++ b/MLEM.Data/RuntimeTexturePacker.cs
@@ -238,7 +238,12 @@ namespace MLEM.Data {
             size.X += request.Padding * 2;
             size.Y += request.Padding * 2;
 
-            var pos = this.firstPossiblePosForSize.TryGetValue(size, out var first) ? first : Point.Zero;
+            // initialize our search position from the cache, or use default (zero)
+            if (!this.firstPossiblePosForSize.TryGetValue(size, out var pos)) {
+                // if our size hasn't been recordet yet, check if a size has been recorded that is smaller in both axes, before which our size definitely won't fit
+                pos = this.firstPossiblePosForSize.OrderByDescending(s => s.Key.X * s.Key.Y).FirstOrDefault(s => s.Key.X <= size.X && s.Key.Y <= size.Y).Value;
+            }
+
             var lowestY = int.MaxValue;
             while (true) {
                 var intersected = false;