com.wallstop-studios.unity-helpers 2.0.0-rc73.18 → 2.0.0-rc73.2

package/Editor/SpriteAtlasGenerator.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b0dd60e3c1f24e7eb4afc773157cb996
+timeCreated: 1746461513

package/Editor/{Sprites/SpriteCropper.cs → SpriteCropper.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor.Sprites
+namespace WallstopStudios.UnityHelpers.Editor
 {
 #if UNITY_EDITOR
     using System;
@@ -6,10 +6,9 @@
     using System.IO;
     using System.Linq;
     using System.Threading.Tasks;
+    using Core.Extension;
     using UnityEditor;
     using UnityEngine;
-    using Core.Extension;
-    using CustomEditors;
     using Object = UnityEngine.Object;
 
     public sealed class SpriteCropper : EditorWindow
@@ -31,60 +30,25 @@
         private const float AlphaThreshold = 0.01f;
 
         [SerializeField]
-        private List<Object> _inputDirectories = new();
+        private Object[] _inputDirectories;
 
         [SerializeField]
         private bool _onlyNecessary;
 
-        [SerializeField]
-        private int _leftPadding;
-
-        [SerializeField]
-        private int _rightPadding;
-
-        [SerializeField]
-        private int _topPadding;
-
-        [SerializeField]
-        private int _bottomPadding;
-
         private List<string> _filesToProcess;
-        private SerializedObject _serializedObject;
-        private SerializedProperty _inputDirectoriesProperty;
-        private SerializedProperty _onlyNecessaryProperty;
-        private SerializedProperty _leftPaddingProperty;
-        private SerializedProperty _rightPaddingProperty;
-        private SerializedProperty _topPaddingProperty;
-        private SerializedProperty _bottomPaddingProperty;
 
         [MenuItem("Tools/Wallstop Studios/Unity Helpers/" + Name)]
         private static void ShowWindow() => GetWindow<SpriteCropper>(Name);
 
-        private void OnEnable()
-        {
-            _serializedObject = new SerializedObject(this);
-            _inputDirectoriesProperty = _serializedObject.FindProperty(nameof(_inputDirectories));
-            _onlyNecessaryProperty = _serializedObject.FindProperty(nameof(_onlyNecessary));
-            _leftPaddingProperty = _serializedObject.FindProperty(nameof(_leftPadding));
-            _rightPaddingProperty = _serializedObject.FindProperty(nameof(_rightPadding));
-            _topPaddingProperty = _serializedObject.FindProperty(nameof(_topPadding));
-            _bottomPaddingProperty = _serializedObject.FindProperty(nameof(_bottomPadding));
-        }
-
         private void OnGUI()
         {
-            EditorGUILayout.LabelField("Input directories", EditorStyles.boldLabel);
-            _serializedObject.Update();
-            PersistentDirectoryGUI.PathSelectorObjectArray(
-                _inputDirectoriesProperty,
-                nameof(SpriteCropper)
-            );
-            EditorGUILayout.PropertyField(_onlyNecessaryProperty, true);
-            EditorGUILayout.PropertyField(_leftPaddingProperty, true);
-            EditorGUILayout.PropertyField(_rightPaddingProperty, true);
-            EditorGUILayout.PropertyField(_topPaddingProperty, true);
-            EditorGUILayout.PropertyField(_bottomPaddingProperty, true);
-            _serializedObject.ApplyModifiedProperties();
+            GUILayout.Label("Drag folders below", EditorStyles.boldLabel);
+            SerializedObject so = new(this);
+            SerializedProperty dirs = so.FindProperty(nameof(_inputDirectories));
+            EditorGUILayout.PropertyField(dirs, true);
+            SerializedProperty onlyNecessary = so.FindProperty(nameof(_onlyNecessary));
+            EditorGUILayout.PropertyField(onlyNecessary, true);
+            so.ApplyModifiedProperties();
 
             if (GUILayout.Button("Find Sprites To Process"))
             {
@@ -115,7 +79,7 @@
         private void FindFilesToProcess()
         {
             _filesToProcess = new List<string>();
-            if (_inputDirectories is not { Count: > 0 })
+            if (_inputDirectories == null || _inputDirectories.Length == 0)
             {
                 this.LogWarn($"No input directories selected.");
                 return;
@@ -154,7 +118,7 @@
 
         private void ProcessFoundSprites()
         {
-            if (_filesToProcess is not { Count: > 0 })
+            if (_filesToProcess == null || _filesToProcess.Count == 0)
             {
                 this.LogWarn($"No files found or selected for processing.");
                 return;
@@ -205,6 +169,11 @@
                             newImporters.Add(newImporter);
                         }
                     }
+
+                    foreach (TextureImporter newImporter in newImporters)
+                    {
+                        newImporter.SaveAndReimport();
+                    }
                 }
                 finally
                 {
@@ -221,6 +190,9 @@
                     $"An error occurred during processing. Last processed: {lastProcessed}.",
                     e
                 );
+                AssetDatabase.StopAssetEditing();
+                AssetDatabase.SaveAssets();
+                AssetDatabase.Refresh();
             }
             finally
             {
@@ -237,7 +209,7 @@
             }
 
             TextureImporter importer = AssetImporter.GetAtPath(assetPath) as TextureImporter;
-            if (importer is not { textureType: TextureImporterType.Sprite })
+            if (importer == null || !importer.textureType.Equals(TextureImporterType.Sprite))
             {
                 return;
             }
@@ -260,10 +232,8 @@
                 return null;
             }
 
-            if (
-                AssetImporter.GetAtPath(assetPath)
-                is not TextureImporter { textureType: TextureImporterType.Sprite } importer
-            )
+            TextureImporter importer = AssetImporter.GetAtPath(assetPath) as TextureImporter;
+            if (importer == null || !importer.textureType.Equals(TextureImporterType.Sprite))
             {
                 return null;
             }
@@ -271,6 +241,7 @@
             TextureImporterSettings originalSettings = new();
             importer.ReadTextureSettings(originalSettings);
 
+            bool originalReadableState = importer.isReadable;
             if (!importer.isReadable)
             {
                 importer.isReadable = true;
@@ -283,142 +254,142 @@
                 return null;
             }
 
-            Color32[] pixels = tex.GetPixels32();
-            int width = tex.width;
-            int height = tex.height;
-            int minX = width;
-            int minY = height;
-            int maxX = 0;
-            int maxY = 0;
-            bool hasVisible = false;
-            object lockObject = new();
-            Parallel.For(
-                0,
-                width * height,
-                () => (minX: width, minY: height, maxX: 0, maxY: 0, hasVisible: false),
-                (index, _, localState) =>
-                {
-                    int x = index % width;
-                    int y = index / width;
-
-                    float a = pixels[index].a / 255f;
-                    if (a > AlphaThreshold)
+            TextureImporter resultImporter;
+            try
+            {
+                Color32[] pixels = tex.GetPixels32();
+
+                int width = tex.width;
+                int height = tex.height;
+                int minX = width;
+                int minY = height;
+                int maxX = 0;
+                int maxY = 0;
+                bool hasVisible = false;
+
+                object lockObject = new();
+
+                Parallel.For(
+                    0,
+                    width * height,
+                    () => (minX: width, minY: height, maxX: 0, maxY: 0, hasVisible: false),
+                    (index, _, localState) =>
                     {
-                        localState.hasVisible = true;
-                        localState.minX = Mathf.Min(localState.minX, x);
-                        localState.minY = Mathf.Min(localState.minY, y);
-                        localState.maxX = Mathf.Max(localState.maxX, x);
-                        localState.maxY = Mathf.Max(localState.maxY, y);
-                    }
-                    return localState;
-                },
-                finalLocalState =>
-                {
-                    if (finalLocalState.hasVisible)
+                        int x = index % width;
+                        int y = index / width;
+
+                        float a = pixels[index].a / 255f;
+                        if (a > AlphaThreshold)
+                        {
+                            localState.hasVisible = true;
+                            localState.minX = Mathf.Min(localState.minX, x);
+                            localState.minY = Mathf.Min(localState.minY, y);
+                            localState.maxX = Mathf.Max(localState.maxX, x);
+                            localState.maxY = Mathf.Max(localState.maxY, y);
+                        }
+                        return localState;
+                    },
+                    finalLocalState =>
                     {
-                        lock (lockObject)
+                        if (finalLocalState.hasVisible)
                         {
-                            hasVisible = true;
-                            minX = Mathf.Min(minX, finalLocalState.minX);
-                            minY = Mathf.Min(minY, finalLocalState.minY);
-                            maxX = Mathf.Max(maxX, finalLocalState.maxX);
-                            maxY = Mathf.Max(maxY, finalLocalState.maxY);
+                            lock (lockObject)
+                            {
+                                hasVisible = true;
+                                minX = Mathf.Min(minX, finalLocalState.minX);
+                                minY = Mathf.Min(minY, finalLocalState.minY);
+                                maxX = Mathf.Max(maxX, finalLocalState.maxX);
+                                maxY = Mathf.Max(maxY, finalLocalState.maxY);
+                            }
                         }
                     }
+                );
+
+                if (!hasVisible)
+                {
+                    return null;
                 }
-            );
 
-            int cropWidth;
-            int cropHeight;
-            if (!hasVisible)
-            {
-                cropWidth = 1;
-                cropHeight = 1;
-                minX = 0;
-                minY = 0;
-            }
-            else
-            {
-                minX = Mathf.Max(0, minX - _leftPadding);
-                minY = Mathf.Max(0, minY - _bottomPadding);
-                maxX = Mathf.Min(width, maxX + _rightPadding);
-                maxY = Mathf.Min(height, maxY + _topPadding);
-                cropWidth = maxX - minX + 1;
-                cropHeight = maxY - minY + 1;
-            }
+                int cropWidth = maxX - minX + 1;
+                int cropHeight = maxY - minY + 1;
 
-            if (_onlyNecessary && (!hasVisible || (cropWidth == width && cropHeight == height)))
-            {
-                return null;
-            }
+                if (_onlyNecessary && cropWidth == width && cropHeight == height)
+                {
+                    return null;
+                }
 
-            Texture2D cropped = new(cropWidth, cropHeight, TextureFormat.RGBA32, false);
-            Color32[] croppedPixels = new Color32[cropWidth * cropHeight];
+                Texture2D cropped = new(cropWidth, cropHeight, TextureFormat.RGBA32, false);
+                Color32[] croppedPixels = new Color32[cropWidth * cropHeight];
 
-            Parallel.For(
-                0,
-                cropHeight,
-                y =>
-                {
-                    int sourceYOffset = (y + minY) * width;
-                    int destYOffset = y * cropWidth;
-                    for (int x = 0; x < cropWidth; ++x)
+                Parallel.For(
+                    0,
+                    cropHeight,
+                    y =>
                     {
-                        croppedPixels[destYOffset + x] = pixels[sourceYOffset + x + minX];
+                        int sourceYOffset = (y + minY) * width;
+                        int destYOffset = y * cropWidth;
+                        for (int x = 0; x < cropWidth; ++x)
+                        {
+                            croppedPixels[destYOffset + x] = pixels[sourceYOffset + x + minX];
+                        }
                     }
+                );
+
+                cropped.SetPixels32(croppedPixels);
+                cropped.Apply();
+
+                string newPath = Path.Combine(
+                    assetDirectory,
+                    CroppedPrefix + Path.GetFileName(assetPath)
+                );
+                File.WriteAllBytes(newPath, cropped.EncodeToPNG());
+                DestroyImmediate(cropped);
+                AssetDatabase.ImportAsset(newPath);
+                TextureImporter newImporter = AssetImporter.GetAtPath(newPath) as TextureImporter;
+                if (newImporter == null)
+                {
+                    return null;
                 }
-            );
-
-            cropped.SetPixels32(croppedPixels);
-            cropped.Apply();
-
-            string newPath = Path.Combine(
-                assetDirectory,
-                CroppedPrefix + Path.GetFileName(assetPath)
-            );
-            File.WriteAllBytes(newPath, cropped.EncodeToPNG());
-            DestroyImmediate(cropped);
-            AssetDatabase.ImportAsset(newPath);
-            TextureImporter newImporter = AssetImporter.GetAtPath(newPath) as TextureImporter;
-            if (newImporter == null)
-            {
-                return null;
-            }
 
-            newImporter.textureType = importer.textureType;
-            newImporter.spriteImportMode = importer.spriteImportMode;
-            newImporter.filterMode = importer.filterMode;
-            newImporter.textureCompression = importer.textureCompression;
-            newImporter.wrapMode = importer.wrapMode;
-            newImporter.mipmapEnabled = importer.mipmapEnabled;
-            newImporter.spritePixelsPerUnit = importer.spritePixelsPerUnit;
-
-            TextureImporterSettings newSettings = new();
-            importer.ReadTextureSettings(newSettings);
-
-            Vector2 origPivot = GetSpritePivot(importer);
-            Vector2 origCenter = new(width * origPivot.x, height * origPivot.y);
-            Vector2 newPivotPixels = origCenter - new Vector2(minX, minY);
-            Vector2 newPivotNorm = new(
-                cropWidth > 0 ? newPivotPixels.x / cropWidth : 0.5f,
-                cropHeight > 0 ? newPivotPixels.y / cropHeight : 0.5f
-            );
-
-            if (!hasVisible)
-            {
-                newPivotNorm = new Vector2(0.5f, 0.5f);
-            }
+                newImporter.textureType = importer.textureType;
+                newImporter.spriteImportMode = importer.spriteImportMode;
+                newImporter.filterMode = importer.filterMode;
+                newImporter.textureCompression = importer.textureCompression;
+                newImporter.wrapMode = importer.wrapMode;
+                newImporter.mipmapEnabled = importer.mipmapEnabled;
+                newImporter.spritePixelsPerUnit = importer.spritePixelsPerUnit;
+
+                TextureImporterSettings newSettings = new();
+                newImporter.ReadTextureSettings(newSettings);
+                newSettings.spriteExtrude = originalSettings.spriteExtrude;
+
+                Vector2 origPivot = GetSpritePivot(importer);
+                Vector2 origCenter = new(width * origPivot.x, height * origPivot.y);
+                Vector2 newPivotPixels = origCenter - new Vector2(minX, minY);
+                Vector2 newPivotNorm = new(
+                    cropWidth > 0 ? newPivotPixels.x / cropWidth : 0.5f,
+                    cropHeight > 0 ? newPivotPixels.y / cropHeight : 0.5f
+                );
 
-            newImporter.spriteImportMode = SpriteImportMode.Single;
-            newImporter.spritePivot = newPivotNorm;
-            newSettings.spritePivot = newPivotNorm;
-            newSettings.spriteAlignment = (int)SpriteAlignment.Custom;
+                newImporter.spriteImportMode = SpriteImportMode.Single;
+                newImporter.spritePivot = newPivotNorm;
+                newSettings.spritePivot = newPivotNorm;
+                newSettings.spriteAlignment = (int)SpriteAlignment.Custom;
 
-            newImporter.SetTextureSettings(newSettings);
-            newImporter.isReadable = true;
-            newImporter.SaveAndReimport();
+                newImporter.SetTextureSettings(newSettings);
+                newImporter.isReadable = false;
+
+                resultImporter = newImporter;
+            }
+            finally
+            {
+                if (importer != null && importer.isReadable != originalReadableState)
+                {
+                    importer.isReadable = originalReadableState;
+                    importer.SaveAndReimport();
+                }
+            }
 
-            TextureImporter resultImporter = newImporter;
             return resultImporter;
         }
 

package/Editor/{Sprites/SpriteSettingsApplier.cs → SpriteSettingsApplier.cs}

@@ -1,16 +1,15 @@
 // ReSharper disable CompareOfFloatsByEqualityOperator
-namespace WallstopStudios.UnityHelpers.Editor.Sprites
+namespace WallstopStudios.UnityHelpers.Editor
 {
 #if UNITY_EDITOR
+    using Core.Attributes;
+    using Core.Extension;
     using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using UnityEditor;
     using UnityEngine;
-    using Core.Attributes;
-    using Core.Extension;
-    using CustomEditors;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -77,7 +76,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
     }
 
     [CustomPropertyDrawer(typeof(SpriteSettings))]
-    public sealed class SpriteSettingsDrawer : PropertyDrawer
+    public class SpriteSettingsDrawer : PropertyDrawer
     {
         private const float CheckboxWidth = 18f;
         private const float HorizontalSpacing = 5f;
@@ -204,10 +203,9 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                         valuePropHeight
                     );
 
-                    using (new EditorGUI.IndentLevelScope())
-                    {
-                        EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
-                    }
+                    EditorGUI.indentLevel++;
+                    EditorGUI.PropertyField(valueRect, valueProp, GUIContent.none, true);
+                    EditorGUI.indentLevel--;
 
                     currentRect.y += valueRect.height + EditorGUIUtility.standardVerticalSpacing;
                 }
@@ -301,16 +299,25 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
         private void OnGUI()
         {
             _serializedObject.Update();
+
             _scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
 
             EditorGUILayout.LabelField("Sprite Sources", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(_spritesProp, new GUIContent("Specific Sprites"), true);
+
             EditorGUILayout.Space();
+
             EditorGUILayout.LabelField("Directory Sources", EditorStyles.boldLabel);
-            PersistentDirectoryGUI.PathSelectorObjectArray(
+            EditorGUILayout.PropertyField(
                 _directoriesProp,
-                nameof(SpriteSettingsApplierWindow)
+                new GUIContent("Scan Directories"),
+                true
             );
+            if (GUILayout.Button("Add Directory via Browser"))
+            {
+                AddDirectory();
+            }
+
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Settings", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(
@@ -323,6 +330,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
                 new GUIContent("Sprite Settings Profiles"),
                 true
             );
+
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Actions", EditorStyles.boldLabel);
 
@@ -353,10 +361,67 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             _serializedObject.ApplyModifiedProperties();
         }
 
+        private void AddDirectory()
+        {
+            string path = EditorUtility.OpenFolderPanel("Select Directory", "Assets", "");
+            if (string.IsNullOrWhiteSpace(path))
+            {
+                return;
+            }
+
+            if (path.StartsWith(Application.dataPath, StringComparison.Ordinal))
+            {
+                string relativePath = "Assets" + path.Substring(Application.dataPath.Length);
+                Object folderAsset = AssetDatabase.LoadAssetAtPath<Object>(relativePath);
+                if (folderAsset != null)
+                {
+                    _directoriesProp.serializedObject.Update();
+                    bool alreadyExists = false;
+                    for (int i = 0; i < _directoriesProp.arraySize; i++)
+                    {
+                        if (
+                            _directoriesProp.GetArrayElementAtIndex(i).objectReferenceValue
+                            == folderAsset
+                        )
+                        {
+                            alreadyExists = true;
+                            break;
+                        }
+                    }
+
+                    if (!alreadyExists)
+                    {
+                        int newIndex = _directoriesProp.arraySize;
+                        _directoriesProp.InsertArrayElementAtIndex(newIndex);
+                        _directoriesProp.GetArrayElementAtIndex(newIndex).objectReferenceValue =
+                            folderAsset;
+                        this.Log($"Added directory: {relativePath}");
+                    }
+                    else
+                    {
+                        this.LogWarn($"Directory already in list: {relativePath}");
+                    }
+                    _directoriesProp.serializedObject.ApplyModifiedProperties();
+                }
+                else
+                {
+                    this.LogError(
+                        $"Could not load asset at path: {relativePath}. Is it a valid folder within Assets?"
+                    );
+                }
+            }
+            else
+            {
+                this.LogError(
+                    $"Selected folder must be inside the project's Assets folder. Path selected: {path}"
+                );
+            }
+        }
+
         private List<(string fullFilePath, string relativePath)> GetTargetSpritePaths()
         {
             HashSet<string> uniqueRelativePaths = new(StringComparer.OrdinalIgnoreCase);
-            HashSet<Object> validDirectories = new();
+            List<Object> validDirectories = new();
 
             for (int i = 0; i < _directoriesProp.arraySize; i++)
             {

package/Editor/{Sprites/TextureResizerWizard.cs → TextureResizerWizard.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor.Sprites
+namespace WallstopStudios.UnityHelpers.Editor
 {
 #if UNITY_EDITOR
     using System;

package/Editor/{Sprites/TextureSettingsApplier.cs → TextureSettingsApplier.cs}

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor.Sprites
+namespace WallstopStudios.UnityHelpers.Editor
 {
 #if UNITY_EDITOR
     using System;

package/Editor/Utils/DxReadOnlyPropertyDrawer.cs

@@ -3,7 +3,7 @@
 #if UNITY_EDITOR
     using UnityEditor;
     using UnityEngine;
-    using Core.Attributes;
+    using WallstopStudios.UnityHelpers.Core.Attributes;
 
     // https://www.patrykgalach.com/2020/01/20/readonly-attribute-in-unity-editor/
     [CustomPropertyDrawer(typeof(DxReadOnlyAttribute))]

package/Editor/Utils/GUIHorizontalScope.cs

@@ -0,0 +1,20 @@
+namespace WallstopStudios.UnityHelpers.Editor.Utils
+{
+#if UNITY_EDITOR
+    using System;
+    using UnityEditor;
+
+    public sealed class GUIHorizontalScope : IDisposable
+    {
+        public GUIHorizontalScope()
+        {
+            EditorGUILayout.BeginHorizontal();
+        }
+
+        public void Dispose()
+        {
+            EditorGUILayout.EndHorizontal();
+        }
+    }
+#endif
+}

package/Editor/Utils/GUIHorizontalScope.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 91a6cb913d1847ae9e2a82b1f59660a7
+timeCreated: 1746644886

package/Runtime/Core/DataStructure/Circle.cs

@@ -34,7 +34,7 @@
             float yN = Math.Max(center.y, rectangle.y);
             float dX = xN - center.x;
             float dY = yN - center.y;
-            return dX * dX + dY * dY <= _radiusSquared;
+            return (dX * dX + dY * dY) <= _radiusSquared;
         }
 
         public bool Overlaps(Bounds bounds)

package/Runtime/Core/DataStructure/QuadTree.cs

@@ -45,7 +45,7 @@
 
                 Bounds[] quadrants =
                 {
-                    new(
+                    new Bounds(
                         new Vector3(
                             boundary.center.x - halfQuadrantSize.x,
                             boundary.center.y + halfQuadrantSize.y,
@@ -53,7 +53,7 @@
                         ),
                         quadrantSize
                     ),
-                    new(
+                    new Bounds(
                         new Vector3(
                             boundary.center.x + halfQuadrantSize.x,
                             boundary.center.y + halfQuadrantSize.y,
@@ -61,7 +61,7 @@
                         ),
                         quadrantSize
                     ),
-                    new(
+                    new Bounds(
                         new Vector3(
                             boundary.center.x + halfQuadrantSize.x,
                             boundary.center.y - halfQuadrantSize.y,
@@ -69,7 +69,7 @@
                         ),
                         quadrantSize
                     ),
-                    new(
+                    new Bounds(
                         new Vector3(
                             boundary.center.x - halfQuadrantSize.x,
                             boundary.center.y - halfQuadrantSize.y,