better tileset initialization in some minor cases

Cammin · Aug 28, 2023 · 631f42b · 631f42b
1 parent 54325ba
commit 631f42b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkPpuInitializer.cs b/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkPpuInitializer.cs
@@ -5,13 +5,15 @@ namespace LDtkUnity.Editor
 {
     internal struct LDtkPpuInitializer
     {
+        public string ImporterPath;
         public string ProjectPath;
         public int PixelsPerUnit;
 
-        public LDtkPpuInitializer(int ppu, string projectPath)
+        public LDtkPpuInitializer(int ppu, string projectPath, string importerPath)
         {
             PixelsPerUnit = ppu;
             ProjectPath = projectPath;
+            ImporterPath = importerPath;
         }
 
         public bool OnResetImporter()
@@ -23,7 +25,11 @@ public bool OnResetImporter()
             }
 
             int defaultGridSize = -1;
-            if (!LDtkJsonDigger.GetDefaultGridSize(ProjectPath, ref defaultGridSize))
+            if (ImporterPath != ProjectPath && AssetImporter.GetAtPath(ProjectPath) is LDtkProjectImporter projectImporter)
+            {
+                defaultGridSize = projectImporter.PixelsPerUnit;
+            }
+            else if (!LDtkJsonDigger.GetDefaultGridSize(ProjectPath, ref defaultGridSize))
             {
                 //if problem, then default to what LDtk also defaults to upon a new project
                 defaultGridSize = LDtkImporterConsts.DEFAULT_PPU;

diff --git a/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkProjectImporter.cs b/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkProjectImporter.cs
@@ -88,7 +88,7 @@ internal sealed class LDtkProjectImporter : LDtkJsonImporter<LDtkProjectFile>
         //this will run upon standard reset, but also upon the meta file generation during the first import
         private void Reset()
         {
-            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, assetPath);
+            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, assetPath, assetPath);
             if (ppu.OnResetImporter())
             {
                 _pixelsPerUnit = ppu.PixelsPerUnit;
@@ -149,7 +149,7 @@ protected override void Import()
 
             //if for whatever reason (or backwards compatibility), if the ppu is -1 in any capacity
             Profiler.BeginSample("SetPixelsPerUnit");
-            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, assetPath);
+            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, assetPath, assetPath);
             if (ppu.TryInitializePixelsPerUnit(json.DefaultGridSize))
             {
                 _pixelsPerUnit = ppu.PixelsPerUnit;

diff --git a/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkTilesetImporter.cs b/Assets/LDtkUnity/Editor/ScriptedImporter/LDtkTilesetImporter.cs
@@ -64,7 +64,7 @@ internal sealed partial class LDtkTilesetImporter : LDtkJsonImporter<LDtkTileset
         //this will run upon standard reset, but also upon the meta file generation during the first import
         private void Reset()
         {
-            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, GetProjectPath());
+            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, GetProjectPath(), assetPath);
             if (ppu.OnResetImporter())
             {
                 _pixelsPerUnit = ppu.PixelsPerUnit;
@@ -101,7 +101,7 @@ protected override void Import()
             Profiler.EndSample();
 
             Profiler.BeginSample("SetPixelsPerUnit");
-            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, GetProjectPath());
+            LDtkPpuInitializer ppu = new LDtkPpuInitializer(_pixelsPerUnit, GetProjectPath(), assetPath);
             if (ppu.OnResetImporter())
             {
                 _pixelsPerUnit = ppu.PixelsPerUnit;