com.wallstop-studios.unity-helpers 2.0.0-rc73.19 → 2.0.0-rc73.3

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

@@ -1,6 +1,7 @@
-namespace WallstopStudios.UnityHelpers.Editor.Sprites
+namespace WallstopStudios.UnityHelpers.Editor
 {
 #if UNITY_EDITOR
+    using Core.Extension;
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -8,9 +9,6 @@
     using System.Text.RegularExpressions;
     using UnityEditor;
     using UnityEngine;
-    using Core.Extension;
-    using Core.Helper;
-    using CustomEditors;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -27,8 +25,6 @@
 
     public sealed class AnimationCreatorWindow : EditorWindow
     {
-        private static readonly char[] WhiteSpaceSplitters = { ' ', '\t', '\n', '\r' };
-
         private SerializedObject _serializedObject;
         private SerializedProperty _animationDataProp;
         private SerializedProperty _animationSourcesProp;
@@ -78,13 +74,12 @@
             _scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
 
             EditorGUILayout.LabelField("Configuration", EditorStyles.boldLabel);
-            PersistentDirectoryGUI.PathSelectorObjectArray(
-                _animationSourcesProp,
-                nameof(AnimationCreatorWindow)
-            );
+            EditorGUILayout.PropertyField(_animationSourcesProp, true);
             EditorGUILayout.PropertyField(_spriteNameRegexProp);
             EditorGUILayout.PropertyField(_textProp);
 
+            DrawAddSourceFolderButton();
+
             if (!string.IsNullOrWhiteSpace(_errorMessage))
             {
                 EditorGUILayout.HelpBox(_errorMessage, MessageType.Error);
@@ -92,7 +87,7 @@
             else if (
                 _animationSourcesProp.arraySize == 0
                 || _animationSourcesProp.FindPropertyRelative("Array.size").intValue == 0
-                || animationSources.TrueForAll(Objects.Null)
+                || animationSources.TrueForAll(s => s == null)
             )
             {
                 EditorGUILayout.HelpBox(
@@ -123,6 +118,78 @@
             _ = _serializedObject.ApplyModifiedProperties();
         }
 
+        private void DrawAddSourceFolderButton()
+        {
+            if (!GUILayout.Button("Add Source Folder..."))
+            {
+                return;
+            }
+
+            string absolutePath = EditorUtility.OpenFolderPanel(
+                "Select Animation Source Folder",
+                "Assets",
+                ""
+            );
+
+            if (string.IsNullOrWhiteSpace(absolutePath))
+            {
+                return;
+            }
+
+            absolutePath = absolutePath.Replace("\\", "/");
+            if (absolutePath.StartsWith(Application.dataPath, StringComparison.OrdinalIgnoreCase))
+            {
+                string relativePath =
+                    "Assets" + absolutePath.Substring(Application.dataPath.Length);
+
+                DefaultAsset folderAsset = AssetDatabase.LoadAssetAtPath<DefaultAsset>(
+                    relativePath
+                );
+
+                if (folderAsset != null && AssetDatabase.IsValidFolder(relativePath))
+                {
+                    bool alreadyExists = false;
+                    for (int i = 0; i < _animationSourcesProp.arraySize; ++i)
+                    {
+                        if (
+                            _animationSourcesProp.GetArrayElementAtIndex(i).objectReferenceValue
+                            == folderAsset
+                        )
+                        {
+                            alreadyExists = true;
+                            this.LogWarn($"Folder '{relativePath}' is already in the list.");
+                            break;
+                        }
+                    }
+
+                    if (!alreadyExists)
+                    {
+                        _animationSourcesProp.arraySize++;
+                        _animationSourcesProp
+                            .GetArrayElementAtIndex(_animationSourcesProp.arraySize - 1)
+                            .objectReferenceValue = folderAsset;
+                        this.Log($"Added source folder: {relativePath}");
+
+                        _serializedObject.ApplyModifiedProperties();
+                        FindAndFilterSprites();
+                        Repaint();
+                    }
+                }
+                else
+                {
+                    this.LogError(
+                        $"Could not load folder asset at path: {relativePath}. Is it a valid folder within the project?"
+                    );
+                }
+            }
+            else
+            {
+                this.LogError(
+                    $"Selected folder must be inside the project's Assets folder. Path selected: {absolutePath}"
+                );
+            }
+        }
+
         private void DrawCheckSpritesButton()
         {
             if (GUILayout.Button("Check/Refresh Filtered Sprites"))
@@ -138,7 +205,10 @@
             int listSize = _animationDataProp.arraySize;
             string[] searchTerms = string.IsNullOrWhiteSpace(_searchString)
                 ? Array.Empty<string>()
-                : _searchString.Split(WhiteSpaceSplitters, StringSplitOptions.RemoveEmptyEntries);
+                : _searchString.Split(
+                    new[] { ' ', '\t', '\n', '\r' },
+                    StringSplitOptions.RemoveEmptyEntries
+                );
 
             List<int> matchingIndices = new();
             for (int i = 0; i < listSize; ++i)
@@ -175,7 +245,7 @@
 
             if (_animationDataIsExpanded)
             {
-                using EditorGUI.IndentLevelScope indent = new();
+                EditorGUI.indentLevel++;
                 if (matchCount > 0)
                 {
                     foreach (int index in matchingIndices)
@@ -203,6 +273,8 @@
                         MessageType.Info
                     );
                 }
+
+                EditorGUI.indentLevel--;
             }
         }
 
@@ -266,13 +338,6 @@
                 }
             }
 
-            if (GUILayout.Button("Create new Animation Data"))
-            {
-                animationData.Add(new AnimationData());
-                _serializedObject.Update();
-                Repaint();
-            }
-
             if (_filteredSprites.Count == 0)
             {
                 EditorGUILayout.HelpBox(
@@ -374,14 +439,14 @@
             }
 
             EditorGUILayout.Space();
-            using (new EditorGUI.DisabledScope(animationData is not { Count: > 0 }))
+            using (new EditorGUI.DisabledScope(animationData == null || animationData.Count == 0))
             {
                 if (GUILayout.Button("Create Animations"))
                 {
                     CreateAnimations();
                 }
             }
-            if (animationData is not { Count: > 0 })
+            if (animationData == null || animationData.Count == 0)
             {
                 EditorGUILayout.HelpBox(
                     "Add Animation Data entries before creating.",
@@ -392,7 +457,7 @@
 
         private void CreateAnimations()
         {
-            if (animationData is not { Count: > 0 })
+            if (animationData is not { Count: not 0 })
             {
                 this.LogError($"No animation data to create.");
                 return;
@@ -467,7 +532,7 @@
                     }
 
                     List<Sprite> frames = data.frames;
-                    if (frames is not { Count: > 0 })
+                    if (frames is not { Count: not 0 })
                     {
                         this.LogWarn(
                             $"Ignoring animation '{animationName}' because it has no frames."
@@ -531,7 +596,7 @@
 
                     string firstFramePath = AssetDatabase.GetAssetPath(validFrames[0]);
                     string assetPath =
-                        Path.GetDirectoryName(firstFramePath).SanitizePath() ?? "Assets";
+                        Path.GetDirectoryName(firstFramePath)?.Replace("\\", "/") ?? "Assets";
                     if (!assetPath.EndsWith("/"))
                     {
                         assetPath += "/";
@@ -594,7 +659,7 @@
             _matchedSpriteCount = 0;
             _unmatchedSpriteCount = 0;
 
-            if (animationSources is not { Count: > 0 } || _compiledRegex == null)
+            if (animationSources is not { Count: not 0 } || _compiledRegex == null)
             {
                 if (_compiledRegex == null && !string.IsNullOrWhiteSpace(spriteNameRegex))
                 {
@@ -602,7 +667,7 @@
                         $"Cannot find sprites, regex pattern '{spriteNameRegex}' is invalid."
                     );
                 }
-                else if (animationSources is not { Count: > 0 })
+                else if (animationSources is not { Count: not 0 })
                 {
                     this.LogWarn($"Cannot find sprites, no animation sources specified.");
                 }
@@ -610,8 +675,13 @@
             }
 
             List<string> searchPaths = new();
-            foreach (Object source in animationSources.Where(Objects.NotNull))
+            foreach (Object source in animationSources)
             {
+                if (source == null)
+                {
+                    continue;
+                }
+
                 string path = AssetDatabase.GetAssetPath(source);
                 if (!string.IsNullOrWhiteSpace(path) && AssetDatabase.IsValidFolder(path))
                 {
@@ -711,7 +781,8 @@
                     }
 
                     string assetPath = AssetDatabase.GetAssetPath(sprite);
-                    string directoryPath = Path.GetDirectoryName(assetPath).SanitizePath() ?? "";
+                    string directoryPath =
+                        Path.GetDirectoryName(assetPath)?.Replace("\\", "/") ?? "";
                     string frameName = sprite.name;
 
                     int splitIndex = frameName.LastIndexOf('_');

package/Editor/AnimationEventEditor.cs

@@ -172,15 +172,16 @@
 
                 DrawSpritePreview(item);
 
-                using (new EditorGUI.IndentLevelScope())
+                EditorGUI.indentLevel++;
+                RenderAnimationEventItem(item, frame, frameRate);
+
+                if (i != stateCopy.Count - 1)
                 {
-                    RenderAnimationEventItem(item, frame, frameRate);
-                    if (i != stateCopy.Count - 1)
-                    {
-                        DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
-                        EditorGUILayout.Space();
-                    }
+                    DrawGuiLine(height: 3, color: new Color(0f, 1f, 0.3f, 1f));
+                    EditorGUILayout.Space();
                 }
+
+                EditorGUI.indentLevel--;
             }
 
             EditorGUILayout.EndScrollView();
@@ -319,7 +320,8 @@
         private void RenderAnimationEventItem(AnimationEventItem item, int frame, float frameRate)
         {
             int index = _state.IndexOf(item);
-            using (new EditorGUILayout.HorizontalScope())
+            EditorGUILayout.BeginHorizontal();
+            try
             {
                 if (
                     1 <= index
@@ -367,6 +369,10 @@
                     return;
                 }
             }
+            finally
+            {
+                EditorGUILayout.EndHorizontal();
+            }
 
             IReadOnlyDictionary<Type, IReadOnlyList<MethodInfo>> lookup = FilterLookup(item);
 
@@ -535,7 +541,7 @@
             ParameterInfo[] arrayParameterInfo = item.selectedMethod.GetParameters();
             if (arrayParameterInfo.Length == 1)
             {
-                using EditorGUI.IndentLevelScope indent = new();
+                EditorGUI.indentLevel++;
 
                 Type paramType = arrayParameterInfo[0].ParameterType;
                 if (paramType == typeof(int))
@@ -596,6 +602,8 @@
                         true
                     );
                 }
+
+                EditorGUI.indentLevel--;
             }
         }
 
@@ -678,7 +686,8 @@
             }
             else if (!item.isTextureReadable && !string.IsNullOrEmpty(spriteName))
             {
-                using (new EditorGUILayout.HorizontalScope())
+                EditorGUILayout.BeginHorizontal();
+                try
                 {
                     GUILayout.Label($"Sprite '{spriteName}' required \"Read/Write\" enabled");
                     if (item.sprite != null && GUILayout.Button("Fix"))
@@ -702,6 +711,10 @@
                         EditorUtility.SetDirty(item.sprite);
                     }
                 }
+                finally
+                {
+                    EditorGUILayout.EndHorizontal();
+                }
             }
             else if (item.isInvalidTextureRect && !string.IsNullOrEmpty(spriteName))
             {

package/Editor/CustomEditors/MatchColliderToSpriteEditor.cs

@@ -3,7 +3,7 @@
 #if UNITY_EDITOR
     using UnityEditor;
     using UnityEngine;
-    using Core.Extension;
+    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Utils;
 
     [CustomEditor(typeof(MatchColliderToSprite))]

package/Editor/FitTextureSizeWindow.cs

@@ -7,7 +7,6 @@
     using UnityEditor;
     using UnityEngine;
     using Core.Extension;
-    using CustomEditors;
     using Object = UnityEngine.Object;
 
     public enum FitMode
@@ -41,7 +40,7 @@
                 nameof(_textureSourcePaths)
             );
 
-            if (_textureSourcePaths is { Count: > 0 })
+            if (_textureSourcePaths != null && _textureSourcePaths.Count != 0)
             {
                 return;
             }
@@ -66,10 +65,50 @@
             _fitMode = (FitMode)EditorGUILayout.EnumPopup("Fit Mode", _fitMode);
 
             EditorGUILayout.Space();
-            PersistentDirectoryGUI.PathSelectorObjectArray(
-                _textureSourcePathsProperty,
-                nameof(FitTextureSizeWindow)
-            );
+            EditorGUILayout.LabelField("Source Folders", EditorStyles.boldLabel);
+
+            if (GUILayout.Button("Add Source Directory"))
+            {
+                string path = EditorUtility.OpenFolderPanel(
+                    "Select Texture Source Directory",
+                    "Assets",
+                    ""
+                );
+                if (!string.IsNullOrWhiteSpace(path))
+                {
+                    if (path.StartsWith(Application.dataPath))
+                    {
+                        string relativePath =
+                            "Assets" + path.Substring(Application.dataPath.Length);
+                        Object folderObject = AssetDatabase.LoadAssetAtPath<Object>(relativePath);
+                        if (folderObject != null)
+                        {
+                            _textureSourcePaths ??= new List<Object>();
+                            if (!_textureSourcePaths.Contains(folderObject))
+                            {
+                                _textureSourcePaths.Add(folderObject);
+                                _potentialChangeCount = -1;
+                            }
+                            else
+                            {
+                                this.LogWarn($"Directory '{relativePath}' is already in the list.");
+                            }
+                        }
+                        else
+                        {
+                            this.LogError($"Could not load asset at path: '{relativePath}'");
+                        }
+                    }
+                    else
+                    {
+                        this.LogError(
+                            $"Selected path is outside the project's Assets folder: '{path}'"
+                        );
+                    }
+                }
+            }
+
+            EditorGUILayout.PropertyField(_textureSourcePathsProperty, true);
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Actions", EditorStyles.boldLabel);
 
@@ -297,14 +336,6 @@
                         _ = updatedImporters.Remove(textureImporter);
                     }
                 }
-            }
-            finally
-            {
-                if (applyChanges)
-                {
-                    AssetDatabase.StopAssetEditing();
-                }
-                EditorUtility.ClearProgressBar();
 
                 if (applyChanges)
                 {
@@ -325,6 +356,14 @@
                     }
                 }
             }
+            finally
+            {
+                if (applyChanges)
+                {
+                    AssetDatabase.StopAssetEditing();
+                }
+                EditorUtility.ClearProgressBar();
+            }
             return changedCount;
         }
     }

package/Editor/PrefabChecker.cs

@@ -148,16 +148,23 @@
             GUI.enabled = wasEnabled && _checkNullObjectReferences;
             try
             {
-                using EditorGUI.IndentLevelScope indent = new();
-                DrawAndAlign(
-                    new GUIContent(
-                        "Only if [ValidateAssignment]",
-                        "Only report null object references if the field has the [ValidateAssignment] attribute."
-                    ),
-                    () => _onlyCheckNullObjectsWithAttribute,
-                    v => _onlyCheckNullObjectsWithAttribute = v,
-                    true
-                );
+                EditorGUI.indentLevel++;
+                try
+                {
+                    DrawAndAlign(
+                        new GUIContent(
+                            "Only if [ValidateAssignment]",
+                            "Only report null object references if the field has the [ValidateAssignment] attribute."
+                        ),
+                        () => _onlyCheckNullObjectsWithAttribute,
+                        v => _onlyCheckNullObjectsWithAttribute = v,
+                        true
+                    );
+                }
+                finally
+                {
+                    EditorGUI.indentLevel--;
+                }
             }
             finally
             {
@@ -367,7 +374,7 @@
 
         private void RunChecks()
         {
-            if (_assetPaths is not { Count: > 0 })
+            if (_assetPaths == null || _assetPaths.Count == 0)
             {
                 this.LogError($"No asset paths specified. Add folders containing prefabs.");
                 return;