Merge remote-tracking branch 'Cammin/master'

Author: leohilbert

.github/workflows/test-runner.yml

@@ -31,7 +31,7 @@ jobs:
                   lfs: true
 
             #Test Cache
-            - uses: actions/cache@v4.0.2
+            - uses: actions/cache@v4.2.3
               with:
                   path: Library
                   key: Library-${{ matrix.unityVersion }}

.github/workflows/test-runner_dispatch.yml

@@ -38,7 +38,7 @@ jobs:
                   lfs: true
 
             #Test Cache
-            - uses: actions/cache@v4.0.2
+            - uses: actions/cache@v4.2.3
               with:
                   path: Library
                   key: Library-${{ matrix.unityVersion }}

.github/workflows/unity-builder.yml

@@ -39,7 +39,7 @@ jobs:
                   lfs: true
 
             #Build Cache
-            - uses: actions/cache@v4.0.2
+            - uses: actions/cache@v4.2.3
               with:
                   path: Library
                   key: Library-${{ matrix.unityVersion }}

Assets/LDtkUnity/CHANGELOG.md

@@ -1,3 +1,50 @@
+## [6.9.2](https://github.com/Cammin/LDtkToUnity/compare/6.9.1...6.9.2) (2025-05-02)
+
+
+### Performance Improvements
+
+* Setting tilemap tiles now leverages TileChangeData introduced in unity 2021.2 to reduce excessive tilemap API calls ([0f77e30](https://github.com/Cammin/LDtkToUnity/commit/0f77e3037299053e5416ec7019d313bead921e0d))
+
+## [6.9.1](https://github.com/Cammin/LDtkToUnity/compare/6.9.0...6.9.1) (2025-04-17)
+
+
+### Bug Fixes
+
+* Fixed a null ref when trying to draw entity ref array or points array when the array was empty ([a023dda](https://github.com/Cammin/LDtkToUnity/commit/a023dda3ed0bb7884a31e484a4f9ad2b9eed2341))
+
+# [6.9.0](https://github.com/Cammin/LDtkToUnity/compare/6.8.0...6.9.0) (2025-04-17)
+
+
+### Features
+
+* Added a new ScaleFactor field to LDtkComponentEntity which can be used to scale your entity in ways other than scaling the transform ([3d5f2d4](https://github.com/Cammin/LDtkToUnity/commit/3d5f2d4333928467947f453d51ade1684a78e43c))
+* Added a toggle option in the project importer inspector to disable scaling entity prefab instances if they were resized in LDtk ([8558ebb](https://github.com/Cammin/LDtkToUnity/commit/8558ebb99b7675bc47d2745bd31cae39b4a59870))
+
+# [6.8.0](https://github.com/Cammin/LDtkToUnity/compare/6.7.1...6.8.0) (2025-04-16)
+
+
+### Features
+
+* Added new type checks for FieldDefinition among other small json data changes ([73040e5](https://github.com/Cammin/LDtkToUnity/commit/73040e579a1ac4c18d12229d2e8b83515052618d))
+* Added support to LDtkTableOfContents ScriptableObject to get fields, and also can access entity definition data from a toc entry ([1149747](https://github.com/Cammin/LDtkToUnity/commit/1149747d6d286a099078bcdad185e84ccec4d88e))
+* Point fields will now draw their Vector2 value in addition to the transform ([9582c59](https://github.com/Cammin/LDtkToUnity/commit/9582c59df613834ecd090f45da545ae2e0c22afa))
+* Refactored the fields system to have a secondary way to get field data from LDtkFields with GetField(). This is a requisite to support fields in LDtkTableOfContents ([e2fb42a](https://github.com/Cammin/LDtkToUnity/commit/e2fb42ab91b8332d3beb538940b6f95c67900711))
+
+## [6.7.1](https://github.com/Cammin/LDtkToUnity/compare/6.7.0...6.7.1) (2025-03-29)
+
+
+### Bug Fixes
+
+* Changed some fields so they are no longer static for more stable parallel import process ([ffeb4ef](https://github.com/Cammin/LDtkToUnity/commit/ffeb4ef981d2c361d113b78c9fa38dd48c068144))
+* Prevent potential infinite import loop (and polluted source control) due to the .ldtkc being written even if the contents don't change ([29fda78](https://github.com/Cammin/LDtkToUnity/commit/29fda78a2686faa9ed53fed166c924e77bb99aaa))
+
+# [6.7.0](https://github.com/Cammin/LDtkToUnity/compare/6.6.2...6.7.0) (2025-03-26)
+
+
+### Features
+
+* Added a Size field for LDtkComponentEntity for getting an easy size in unity units. Relegated it's previous Size field into PxSize ([f4b3089](https://github.com/Cammin/LDtkToUnity/commit/f4b30890a5d0b9ecee1a235ba5b15c2869d53237))
+
 ## [6.6.2](https://github.com/Cammin/LDtkToUnity/compare/6.6.1...6.6.2) (2024-12-15)
 
 

Assets/LDtkUnity/Editor/Builders/LDtkBuilderEntity.cs

@@ -55,18 +55,21 @@ private void BuildEntityInstance()
             AddIidComponent();
 
             PositionEntity();
-            ScaleEntity();
 
             LDtkProfiler.BeginSample("AddFieldData");
             AddFieldData();
             LDtkProfiler.EndSample();
 
             PopulateEntityComponent();
+            
+            ScaleEntity();
         }
 
         private void PopulateEntityComponent()
         {
-            _entityComponent.OnImport(Importer.DefinitionObjects, _entity, LayerComponent, _fieldsComponent, _iidComponent);
+            Vector2 size = ((Vector2)_entity.UnityPxSize / Project.PixelsPerUnit);
+            
+            _entityComponent.OnImport(Importer.DefinitionObjects, _entity, LayerComponent, _fieldsComponent, _iidComponent, size);
         }
 
         private void CreateEntityInstance()
@@ -124,9 +127,11 @@ private void InterfaceEvents()
 
         private void ScaleEntity()
         {
+            if (!Project.ScaleEntities) return;
+            
             //modify by the resized entity scaling from LDtk
             Vector3 newScale = _entityObj.transform.localScale;
-            newScale.Scale(_entity.UnityScale);
+            newScale.Scale(_entityComponent.ScaleFactor);
             _entityObj.transform.localScale = newScale;
         }
 
@@ -193,7 +198,7 @@ private void AddHandleDrawers(GameObject gameObject, EntityInstance entityInstan
             EntityDefinition entityDef = entityInstance.Definition;
 
             string entityPath = GetEntityImageAndRect(entityInstance, Project.assetPath, out Rect entityIconRect);
-            Vector2 size = (Vector2)entityInstance.UnitySize / Project.PixelsPerUnit;
+            Vector2 size = (Vector2)entityInstance.UnityPxSize / Project.PixelsPerUnit;
 
             Color smartColor = entityInstance.UnitySmartColor;
 

Assets/LDtkUnity/Editor/Builders/LDtkBuilderIntGridValue.cs

@@ -81,35 +81,36 @@ public void BuildIntGridValues()
                                        $"Level:{Layer.LevelReference.Identifier}, Layer:{Layer.Identifier}, IntGridValue:{intGridValue}");
                     continue;
                 }
-
+                
                 IntGridValueDefinition intGridValueDef = intGridValueDefs[index];
-                TileBase tile = defToTile[intGridValueDef];
 
                 LDtkProfiler.BeginSample("GetTilemapToBuildOn");
                 TilemapTilesBuilder tilemapToBuildOn = GetTilemapToBuildOn(defToKey[intGridValueDef]);
                 LDtkProfiler.EndSample();
 
                 //Set all the tilemap call configurations, but set the actual tile later via an optimized SetTiles
                 LDtkProfiler.BeginSample("ConvertCellCoord");
-                Vector3Int cellToPut = ConvertCellCoord(cell);
+                Vector3Int cellPosition = ConvertCellCoord(cell);
                 LDtkProfiler.EndSample();
+                
+                TileBase tile = defToTile[intGridValueDef];
 
-                LDtkProfiler.BeginSample("SetPendingTile");
-                tilemapToBuildOn.SetPendingTile(cellToPut, tile);
+                LDtkProfiler.BeginSample("intGridValueDef.UnityColor");
+                Color color = intGridValueDef.UnityColor;
+                LDtkProfiler.EndSample();
+                
+                LDtkProfiler.BeginSample("GetIntGridValueScale");
+                Matrix4x4 matrix = GetIntGridValueScale(tile);
                 LDtkProfiler.EndSample();
 
-                //color & transform
-                LDtkProfiler.BeginSample("SetColorAndMatrix");
-                tilemapToBuildOn.SetColor(cellToPut, intGridValueDef.UnityColor);
-                Matrix4x4? matrix = GetIntGridValueScale(tile);
-                if (matrix != null)
-                {
-                    tilemapToBuildOn.SetTransformMatrix(cellToPut, matrix.Value);
-                }
-
+                LDtkProfiler.BeginSample("construct TileChangeData");
+                TileChangeData data = new TileChangeData(cellPosition, tile, color, matrix);
+                LDtkProfiler.EndSample();
+                
+                LDtkProfiler.BeginSample("AddTileChangeData");
+                tilemapToBuildOn.AddTileChangeData(ref data);
                 LDtkProfiler.EndSample();
             }
-
             LDtkProfiler.EndSample();
 
             LDtkProfiler.BeginSample("IterateAllTilemaps");
@@ -120,7 +121,7 @@ public void BuildIntGridValues()
                 Tilemap tilemap = builder.Map;
 
                 LDtkProfiler.BeginSample("IntGrid.ApplyPendingTiles");
-                builder.ApplyPendingTiles(true);
+                builder.ApplyIntGridTiles();
                 LDtkProfiler.EndSample();
 
                 tilemap.SetOpacity(Layer);
@@ -203,8 +204,9 @@ private Tilemap CreateNewTilemap(TilemapKey key)
         /// <summary>
         /// There's also scaling code from <see cref="LDtkBuilderLevel.BuildLayerInstance"/> and also in the tileset builder for scale there
         /// </summary>
-        private Matrix4x4? GetIntGridValueScale(TileBase tile)
+        private Matrix4x4 GetIntGridValueScale(TileBase tile)
         {
+            //todo consider job-ifying this to run this math in parallel
             Vector2 scale = Vector2.one;
 
             //make the scale correct across every pixels per unit configuration from the importer
@@ -214,7 +216,7 @@ private Tilemap CreateNewTilemap(TilemapKey key)
 
             if (!GetTileDataForTile(tile, out var data))
             {
-                return null;
+                return Matrix4x4.identity;
             }
 
             if (data.colliderType != Tile.ColliderType.Sprite)

Assets/LDtkUnity/Editor/Builders/LDtkBuilderTileset.cs

@@ -1,4 +1,5 @@
-using Unity.Jobs;
+using System.Collections.Generic;
+using Unity.Jobs;
 using UnityEngine;
 using UnityEngine.Tilemaps;
 
@@ -7,7 +8,9 @@ namespace LDtkUnity.Editor
     internal sealed class LDtkBuilderTileset : LDtkBuilderLayer
     {
         private TileInstance[] _tiles;
-        private TilemapTilesBuilder _tilesetProvider;
+
+        //in most realistic situations, tiles will not overlap, but we can overestimate anyways to avoid resizing 
+        private Dictionary<Vector3Int, int> _depth;
 
         public Tilemap Map;
 
@@ -87,7 +90,7 @@ public void BuildTileset(TileInstance[] tiles)
             LDtkProfiler.EndSample();
 
             LDtkProfiler.BeginSample("new ConstructNewTilemap");
-            _tilesetProvider = new TilemapTilesBuilder(Map, tiles.Length);
+            _depth = new Dictionary<Vector3Int, int>(10);
             LDtkProfiler.EndSample();
 
             //if we are also an intgrid layer, then we already reduced our position in the intGridBuilder
@@ -102,15 +105,17 @@ public void BuildTileset(TileInstance[] tiles)
             Map.SetOpacity(Layer);
             LDtkProfiler.EndSample();
 
-            LDtkProfiler.BeginSample("CacheNeededTilesArtifacts");
-            TileBase[] tileAssets = new TileBase[tilesLength];
+            LDtkProfiler.BeginSample("CacheNeededTilesArtifactsAndSetupColor");
+            TileChangeData[] tileAssets = new TileChangeData[tilesLength];
+            //Determine tile asset and setup color while the job is running
             LDtkTilesetTile[] artifactTiles = artifacts._tiles;
             int artifactCount = artifactTiles.Length;
             for (int i = 0; i < tilesLength; i++)
             {
-                int? t = _tiles[i].T;
+                tileAssets[i].color = new Color(1, 1, 1, _tiles[i].A);
 
-                //it's possible that a t value is null in the json, unfortunately
+                int? t = _tiles[i].T;
+                //it's possible that a t value is null in the json, unfortunately for performance's sake
                 if (t == null)
                 {
                     continue;
@@ -122,11 +127,12 @@ public void BuildTileset(TileInstance[] tiles)
                 int tValue = t.Value;
                 if (tValue < artifactCount)
                 {
-                    tileAssets[i] = artifactTiles[tValue];
+                    tileAssets[i].tile = artifactTiles[tValue];
                 }
             }
             LDtkProfiler.EndSample();
 
+            //Job is done, we can use the output now!
             LDtkProfiler.BeginSample("handle.Complete");
             handle.Complete();
             LDtkProfiler.EndSample();
@@ -135,35 +141,24 @@ public void BuildTileset(TileInstance[] tiles)
             job.Input.Dispose();
             LDtkProfiler.EndSample();
 
-            LDtkProfiler.BeginSample("RecalculateCellPositions");
-            Vector3Int[] cells = new Vector3Int[tilesLength];
+            LDtkProfiler.BeginSample("RecalculateCellPositionsAndSetupMatrix");
             for (int i = 0; i < tilesLength; i++)
             {
-                cells[i] = job.Output[i].Cell;
-                cells[i].z = _tilesetProvider.GetNextCellZ(cells[i]);
+                //todo find a way to improve performance of this somehow where we dont need to make a vector3int copy
+                Vector3Int cell = job.Output[i].Cell;
+                cell.z = GetNextCellZ(cell);
+                tileAssets[i].position = cell;
+                tileAssets[i].transform = job.Output[i].Matrix;
             }
             LDtkProfiler.EndSample();
 
             LDtkProfiler.BeginSample("Tilemap.SetTiles");
-            Map.SetTiles(cells, tileAssets);
-            LDtkProfiler.EndSample();
-            
-            LDtkProfiler.BeginSample("SetColorAndMatrix");
-            for (int i = 0; i < tilesLength; i++)
-            {
-                Color color = new Color(1, 1, 1, _tiles[i].A);
-                Matrix4x4 matrix = job.Output[i].Matrix;
-                _tilesetProvider.SetColorAndMatrix(cells[i], ref color, ref matrix);
-            }
+            TilemapTilesBuilder.SetTiles(Map, tileAssets);
             LDtkProfiler.EndSample();
 
             LDtkProfiler.BeginSample("Output.Dispose");
             job.Output.Dispose();
             LDtkProfiler.EndSample();
-
-            LDtkProfiler.BeginSample("ApplyExtraData");
-            _tilesetProvider.ApplyExtraData();
-            LDtkProfiler.EndSample();
 
             LDtkProfiler.BeginSample("CompressBounds");
             Map.CompressBounds();
@@ -174,5 +169,18 @@ private TilesetDefinition EvaluateTilesetDefinition()
         {
             return Layer.OverrideTilesetUid != null ? Layer.OverrideTilesetDefinition : Layer.TilesetDefinition;
         }
+        
+        /// <param name="cell">Z is always 0</param>
+        private int GetNextCellZ(Vector3Int cell)
+        {
+            if (!_depth.ContainsKey(cell))
+            {
+                _depth.Add(cell, 0);
+                return 0;
+            }
+
+            _depth[cell] += 1;
+            return _depth[cell];
+        }
     }
 }

Assets/LDtkUnity/Editor/Builders/LDtkBuilderWorld.cs

@@ -31,7 +31,7 @@ public LDtkComponentWorld BuildWorld()
 
             LDtkComponentLevel[] levels = null;
 
-            //don't make levels if we are using separate levels
+            //don't make levels if we are using separate levels because the levels in the project only contain root-level information
             if (!_json.ExternalLevels)
             {
                 levels = BuildLevels();

Assets/LDtkUnity/Editor/Builders/TileBuildingJob.cs

@@ -5,6 +5,9 @@
 
 namespace LDtkUnity.Editor
 {
+    /// <summary>
+    /// This job is for calculating the tile matrix and cell position for each tile in a layer.
+    /// </summary>
     internal struct TileBuildingJob : IJobFor
     {
         public struct InputData
@@ -24,10 +27,10 @@ public struct OutputData
         [ReadOnly] public NativeArray<InputData> Input;
         [WriteOnly] public NativeArray<OutputData> Output;
 
-        [ReadOnly] public int LayerGridSize;
-        [ReadOnly] public int LayerCWid;
-        [ReadOnly] public int LayerCHei;
-        [ReadOnly] public float ScaleFactor;
+        [ReadOnly] private int LayerGridSize;
+        [ReadOnly] private int LayerCWid;
+        [ReadOnly] private int LayerCHei;
+        [ReadOnly] private float ScaleFactor;
 
         public TileBuildingJob(TileInstance[] tiles, LayerInstance layer, float layerScale)
         {