From 5b057c10a86a7e3796b6cce22cce3bb5067a66d5 Mon Sep 17 00:00:00 2001
From: RDPolarity <rdpolarity@gmail.com>
Date: Tue, 21 Oct 2025 15:16:16 +1100
Subject: [PATCH] feat: `LDtkDefiniationObjectTileset` now references the
 relevant tile set artifact

---
 .../LDtkDefinitionObjectTileset.cs            |  6 ++++-
 .../LDtkDefinitionObjectsCache.cs             | 24 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectTileset.cs b/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectTileset.cs
index 596767aa..ffa3dc6b 100644
--- a/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectTileset.cs
+++ b/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectTileset.cs
@@ -9,6 +9,9 @@ public sealed class LDtkDefinitionObjectTileset : LDtkDefinitionObject<TilesetDe
         [field: Tooltip("Grid-based size")]
         [field: SerializeField] public Vector2Int CSize { get; private set; }
         
+        [field: Tooltip("Artifacts generated from this tileset that contain tiles and sprites.")]
+        [field: SerializeField] public LDtkArtifactAssetsTileset Artifacts { get; private set; }
+        
         [field: Tooltip("If this value is set, then it means that this atlas uses an internal LDtk atlas image instead of a loaded one.")]
         [field: SerializeField] public bool EmbedAtlas { get; private set; }
         
@@ -64,6 +67,7 @@ internal override void SetAssetName()
         internal override void Populate(LDtkDefinitionObjectsCache cache, TilesetDefinition def)
         {
             CSize = def.UnityCSize;
+            Artifacts = cache.GetTilesetArtifacts(def.Uid);
             EmbedAtlas = def.EmbedAtlas != null;
             Identifier = def.Identifier;
             Padding = def.Padding;
@@ -84,4 +88,4 @@ internal override void Populate(LDtkDefinitionObjectsCache cache, TilesetDefinit
             //SavedSelections = def.SavedSelections;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectsCache.cs b/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectsCache.cs
index 40e80c62..72dccd9d 100644
--- a/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectsCache.cs
+++ b/Assets/LDtkUnity/Runtime/Data/Extensions/Definition/ScriptableObjects/LDtkDefinitionObjectsCache.cs
@@ -25,6 +25,7 @@ internal class LDtkDefinitionObjectsCache
         
         //key: tilesetuid, value: rectangle to sprite ref
         private Dictionary<int, Dictionary<Rect,Sprite>> _allSprites;
+        private Dictionary<int, LDtkArtifactAssetsTileset> _tilesetArtifacts;
         
         internal LDtkDefinitionObjectsCache(LDtkDebugInstance logger)
         {
@@ -69,9 +70,15 @@ public void InitializeFromLevel(List<LDtkDefinitionObject> defs, Dictionary<int,
         
         private void InitializeTilesets(Dictionary<int, LDtkArtifactAssetsTileset> tilesets)
         {
-            _allSprites = new Dictionary<int, Dictionary<Rect,Sprite>>(tilesets.Count);
+            tilesets ??= new Dictionary<int, LDtkArtifactAssetsTileset>();
+            
+            _tilesetArtifacts = new Dictionary<int, LDtkArtifactAssetsTileset>(tilesets.Count);
+            _allSprites = new Dictionary<int, Dictionary<Rect, Sprite>>(tilesets.Count);
+            
             foreach (var pair in tilesets)
             {
+                _tilesetArtifacts[pair.Key] = pair.Value;
+                
                 Dictionary<Rect, Sprite> dict;
                 if (pair.Value != null)
                 {
@@ -83,6 +90,7 @@ private void InitializeTilesets(Dictionary<int, LDtkArtifactAssetsTileset> tiles
                 {
                     dict = new Dictionary<Rect, Sprite>();
                 }
+                
                 _allSprites.Add(pair.Key, dict);
             }
         }
@@ -212,7 +220,7 @@ public T GetObject<T>(int uid) where T : ScriptableObject
             _logger.LogError($"Failed to get a \"{typeof(T).Name}\" of uid {uid} due to a type mismatch with {obj.GetType().Name}");
             return null;
         }
-
+        
         /// <summary>
         /// Could return null sprite if the tile would only have clear pixels.
         /// <seealso cref="LDtkArtifactAssetsTileset.FindAdditionalSpriteForRect"/>
@@ -252,6 +260,16 @@ public Sprite GetSpriteForTilesetRectangle(TilesetRectangle rectangle)
 
             return sprite;
         }
+
+        internal LDtkArtifactAssetsTileset GetTilesetArtifacts(int uid)
+        {
+            if (_tilesetArtifacts != null && _tilesetArtifacts.TryGetValue(uid, out var artifacts))
+            {
+                return artifacts;
+            }
+
+            return null;
+        }
         
         private void CacheDictToListViaProject()
         {
@@ -274,4 +292,4 @@ private void CacheListToDictViaLevel()
             }
         }
     }
-}
\ No newline at end of file
+}