com.wallstop-studios.unity-helpers 2.0.0-rc81.4 → 2.0.0-rc81.6

package/Editor/Sprites/ScriptableSpriteAtlas.cs

@@ -161,6 +161,18 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
         public int crunchCompressionLevel = 50;
 
         public TextureImporterCompression compression = TextureImporterCompression.Compressed;
+
+        private void OnValidate()
+        {
+            if (!Application.isPlaying)
+            {
+                int removed = spritesToPack.RemoveAll(sprite => sprite == null);
+                if (removed > 0)
+                {
+                    EditorUtility.SetDirty(this);
+                }
+            }
+        }
     }
 #endif
 }

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -13,6 +13,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
     using UnityEditor.U2D;
     using UnityEngine;
     using UnityEngine.U2D;
+    using WallstopStudios.UnityHelpers.Utils;
     using Object = UnityEngine.Object;
 
     public sealed class ScriptableSpriteAtlasEditor : EditorWindow
@@ -806,9 +807,38 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             platformSettings.textureCompression = config.compression;
             atlas.SetPlatformSettings(platformSettings);
 
-            Object[] spritesToAdd = config.spritesToPack.Where(s => s != null).ToArray<Object>();
-            if (spritesToAdd.Length > 0)
+            int spriteCount = atlas.spriteCount;
+            using PooledResource<Sprite[]> spriteResource = WallstopArrayPool<Sprite>.Get(
+                spriteCount
+            );
+            Sprite[] sprites = spriteResource.resource;
+            int loaded = atlas.GetSprites(sprites);
+            using PooledResource<List<Sprite>> removeResource = Buffers<Sprite>.List.Get();
+            List<Sprite> toRemove = removeResource.resource;
+
+            for (int i = 0; i < loaded; ++i)
+            {
+                Sprite sprite = sprites[i];
+                if (sprite == null)
+                {
+                    toRemove.Add(sprite);
+                }
+            }
+
+            if (toRemove.Count > 0)
+            {
+                atlas.Remove(toRemove.ToArray<Object>());
+            }
+
+            int removed = config.spritesToPack.RemoveAll(sprite => sprite == null);
+            if (removed > 0)
+            {
+                EditorUtility.SetDirty(config);
+            }
+
+            if (config.spritesToPack.Count > 0)
             {
+                Object[] spritesToAdd = config.spritesToPack.ToArray<Object>();
                 atlas.Add(spritesToAdd);
             }
             else
@@ -833,7 +863,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 AssetDatabase.Refresh();
             }
             this.Log(
-                $"'{config.name}': Successfully generated/updated at {outputPath}. Sprites included: {spritesToAdd.Length}."
+                $"'{config.name}': Successfully generated/updated at {outputPath}. Sprites included: {config.spritesToPack.Count}."
             );
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc81.4",
+  "version": "2.0.0-rc81.6",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},