com.wallstop-studios.unity-helpers 2.0.0-rc73.8 → 2.0.0-rc74.0

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

@@ -1,4 +1,4 @@
-namespace WallstopStudios.UnityHelpers.Editor
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
     using System;
@@ -10,16 +10,15 @@
     using UnityEngine;
     using Core.Extension;
     using Core.Helper;
+    using CustomEditors;
 
     public sealed class AnimationCopierWindow : EditorWindow
     {
-        private const string SourcePathPrefKey = "AnimationCopier_SourcePathRelative";
-        private const string DestPathPrefKey = "AnimationCopier_DestPathRelative";
-        private const string DefaultSourcePath = "Assets/Sprites";
-        private const string DefaultDestPath = "Assets/Animations";
+        [SerializeField]
+        private string _animationSourcePathRelative = "Assets/Sprites";
 
-        private string _animationSourcePathRelative = "";
-        private string _animationDestinationPathRelative = "";
+        [SerializeField]
+        private string _animationDestinationPathRelative = "Assets/Animations";
         private string _fullSourcePath = "";
         private string _fullDestinationPath = "";
 
@@ -28,6 +27,10 @@
         private bool _isCopying;
         private bool _isDeleting;
 
+        private SerializedObject _serializedObject;
+        private SerializedProperty _animationSourcesPathProperty;
+        private SerializedProperty _animationDestinationPathProperty;
+
         private readonly List<AnimationFileInfo> _sourceAnimations = new();
         private readonly List<AnimationFileInfo> _newAnimations = new();
         private readonly List<AnimationFileInfo> _changedAnimations = new();
@@ -67,7 +70,13 @@
 
         private void OnEnable()
         {
-            LoadPaths();
+            _serializedObject = new SerializedObject(this);
+            _animationSourcesPathProperty = _serializedObject.FindProperty(
+                nameof(_animationSourcePathRelative)
+            );
+            _animationDestinationPathProperty = _serializedObject.FindProperty(
+                nameof(_animationDestinationPathRelative)
+            );
             ValidatePaths();
             _analysisNeeded = true;
             this.Log($"Animation Copier Window opened.");
@@ -75,6 +84,7 @@
 
         private void OnGUI()
         {
+            _serializedObject.Update();
             bool operationInProgress = _isAnalyzing || _isCopying || _isDeleting;
 
             if (operationInProgress)
@@ -88,18 +98,18 @@
 
             EditorGUI.BeginDisabledGroup(operationInProgress);
 
-            DrawPathSection(
+            PersistentDirectoryGUI.PathSelectorString(
+                _animationSourcesPathProperty,
+                nameof(AnimationCopierWindow),
                 "Source Path",
-                ref _animationSourcePathRelative,
-                ref _fullSourcePath,
-                SourcePathPrefKey
+                new GUIContent("Source Path")
             );
             EditorGUILayout.Separator();
-            DrawPathSection(
+            PersistentDirectoryGUI.PathSelectorString(
+                _animationDestinationPathProperty,
+                nameof(AnimationCopierWindow),
                 "Destination Path",
-                ref _animationDestinationPathRelative,
-                ref _fullDestinationPath,
-                DestPathPrefKey
+                new GUIContent("Destination Path")
             );
             EditorGUILayout.Separator();
 
@@ -126,85 +136,6 @@
             }
         }
 
-        private void DrawPathSection(
-            string label,
-            ref string relativePath,
-            ref string fullPath,
-            string prefKey
-        )
-        {
-            if (!prefKey.StartsWith("WallstopStudios.UnityHelpers.Editor"))
-            {
-                prefKey = "WallstopStudios.UnityHelpers.Editor" + prefKey;
-            }
-            EditorGUILayout.LabelField(label + ":", EditorStyles.boldLabel);
-
-            EditorGUI.BeginChangeCheck();
-            string newRelativePath = EditorGUILayout.TextField(relativePath ?? "");
-            if (EditorGUI.EndChangeCheck() && newRelativePath != relativePath)
-            {
-                if (string.IsNullOrWhiteSpace(newRelativePath))
-                {
-                    relativePath = "";
-                    fullPath = "";
-                    EditorPrefs.SetString(prefKey, "");
-                    ValidatePaths();
-                    _analysisNeeded = true;
-                }
-                else
-                {
-                    string tempFullPath = GetFullPathFromRelative(newRelativePath);
-                    if (tempFullPath != null && Directory.Exists(tempFullPath))
-                    {
-                        relativePath = newRelativePath;
-                        fullPath = tempFullPath;
-                        EditorPrefs.SetString(prefKey, relativePath);
-                        ValidatePaths();
-                        _analysisNeeded = true;
-                    }
-                    else
-                    {
-                        this.LogWarn(
-                            $"Manual path entry '{newRelativePath}' is invalid or not inside Assets. Please use the button."
-                        );
-                    }
-                }
-            }
-
-            if (GUILayout.Button("Browse..."))
-            {
-                string initialPath = Directory.Exists(fullPath) ? fullPath : Application.dataPath;
-                string selectedPath = EditorUtility.OpenFolderPanel(
-                    $"Select {label}",
-                    initialPath,
-                    string.Empty
-                );
-
-                if (!string.IsNullOrWhiteSpace(selectedPath))
-                {
-                    string newRelPath = GetRelativeAssetPath(selectedPath);
-                    if (newRelPath != null)
-                    {
-                        relativePath = newRelPath;
-                        fullPath = selectedPath.SanitizePath();
-                        EditorPrefs.SetString(prefKey, relativePath);
-                        this.Log($"{label} set to: {relativePath}");
-                        ValidatePaths();
-                        _analysisNeeded = true;
-                        Repaint();
-                    }
-                    else
-                    {
-                        EditorUtility.DisplayDialog(
-                            "Invalid Path",
-                            "The selected path must be inside the project's 'Assets' folder.",
-                            "OK"
-                        );
-                    }
-                }
-            }
-        }
-
         private void DrawAnalysisSection()
         {
             EditorGUILayout.LabelField("Analysis:", EditorStyles.boldLabel);
@@ -339,18 +270,6 @@
             }
         }
 
-        private void LoadPaths()
-        {
-            _animationSourcePathRelative = EditorPrefs.GetString(
-                SourcePathPrefKey,
-                DefaultSourcePath
-            );
-            _animationDestinationPathRelative = EditorPrefs.GetString(
-                DestPathPrefKey,
-                DefaultDestPath
-            );
-        }
-
         private void ValidatePaths()
         {
             _fullSourcePath = GetFullPathFromRelative(_animationSourcePathRelative);
@@ -390,7 +309,12 @@
             return !string.IsNullOrWhiteSpace(_animationSourcePathRelative)
                 && !string.IsNullOrWhiteSpace(_animationDestinationPathRelative)
                 && _fullSourcePath != null
-                && _fullDestinationPath != null;
+                && _fullDestinationPath != null
+                && !string.Equals(
+                    _animationSourcePathRelative,
+                    _animationDestinationPathRelative,
+                    StringComparison.Ordinal
+                );
         }
 
         private void AnalyzeAnimations()
@@ -615,7 +539,7 @@
 
                 try
                 {
-                    EnsureDirectoryExists(destDirectory);
+                    DirectoryHelper.EnsureDirectoryExists(destDirectory);
                 }
                 catch (Exception ex)
                 {
@@ -902,63 +826,6 @@
                 return string.Empty;
             }
         }
-
-        private void EnsureDirectoryExists(string relativeDirectoryPath)
-        {
-            if (string.IsNullOrWhiteSpace(relativeDirectoryPath))
-            {
-                return;
-            }
-
-            if (!relativeDirectoryPath.StartsWith("Assets/"))
-            {
-                if (relativeDirectoryPath.Equals("Assets", StringComparison.OrdinalIgnoreCase))
-                {
-                    return;
-                }
-
-                this.LogError(
-                    $"Attempted to create directory outside of Assets: '{relativeDirectoryPath}'"
-                );
-                throw new ArgumentException(
-                    "Cannot create directories outside the Assets folder using AssetDatabase.",
-                    nameof(relativeDirectoryPath)
-                );
-            }
-
-            if (AssetDatabase.IsValidFolder(relativeDirectoryPath))
-            {
-                return;
-            }
-
-            string parentPath = Path.GetDirectoryName(relativeDirectoryPath).SanitizePath();
-            if (
-                string.IsNullOrWhiteSpace(parentPath)
-                || parentPath.Equals("Assets", StringComparison.OrdinalIgnoreCase)
-            )
-            {
-                string folderNameToCreate = Path.GetFileName(relativeDirectoryPath);
-                if (
-                    !string.IsNullOrWhiteSpace(folderNameToCreate)
-                    && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
-                )
-                {
-                    AssetDatabase.CreateFolder("Assets", folderNameToCreate);
-                }
-                return;
-            }
-
-            EnsureDirectoryExists(parentPath);
-            string currentFolderName = Path.GetFileName(relativeDirectoryPath);
-            if (
-                !string.IsNullOrWhiteSpace(currentFolderName)
-                && !AssetDatabase.IsValidFolder(relativeDirectoryPath)
-            )
-            {
-                AssetDatabase.CreateFolder(parentPath, currentFolderName);
-                this.Log($"Created folder: {relativeDirectoryPath}");
-            }
-        }
     }
 #endif
 }

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

@@ -1,16 +1,16 @@
-namespace WallstopStudios.UnityHelpers.Editor
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
-    using Core.Extension;
     using System;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using System.Text.RegularExpressions;
-    using Core.Helper;
     using UnityEditor;
     using UnityEngine;
-    using Utils;
+    using Core.Extension;
+    using Core.Helper;
+    using CustomEditors;
     using Object = UnityEngine.Object;
 
     [Serializable]
@@ -78,12 +78,13 @@
             _scrollPosition = EditorGUILayout.BeginScrollView(_scrollPosition);
 
             EditorGUILayout.LabelField("Configuration", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(_animationSourcesProp, true);
+            PersistentDirectoryGUI.PathSelectorObjectArray(
+                _animationSourcesProp,
+                nameof(AnimationCreatorWindow)
+            );
             EditorGUILayout.PropertyField(_spriteNameRegexProp);
             EditorGUILayout.PropertyField(_textProp);
 
-            DrawAddSourceFolderButton();
-
             if (!string.IsNullOrWhiteSpace(_errorMessage))
             {
                 EditorGUILayout.HelpBox(_errorMessage, MessageType.Error);
@@ -122,78 +123,6 @@
             _ = _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.SanitizePath();
-            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"))
@@ -246,7 +175,7 @@
 
             if (_animationDataIsExpanded)
             {
-                using GUIIndentScope indent = new();
+                using EditorGUI.IndentLevelScope indent = new();
                 if (matchCount > 0)
                 {
                     foreach (int index in matchingIndices)
@@ -337,6 +266,13 @@
                 }
             }
 
+            if (GUILayout.Button("Create new Animation Data"))
+            {
+                animationData.Add(new AnimationData());
+                _serializedObject.Update();
+                Repaint();
+            }
+
             if (_filteredSprites.Count == 0)
             {
                 EditorGUILayout.HelpBox(

package/Editor/Sprites/ScriptableSpriteAtlas.cs

@@ -0,0 +1,95 @@
+namespace WallstopStudios.UnityHelpers.Editor.Sprites
+{
+#if UNITY_EDITOR
+    using UnityEngine;
+    using System.Collections.Generic;
+    using Core.Attributes;
+    using Core.Helper;
+    using UnityEditor;
+
+    [System.Serializable]
+    public sealed class SourceFolderEntry
+    {
+        [Tooltip("Folder to scan for sprites. Path relative to Assets/.")]
+        public string folderPath = "Assets/Sprites/";
+
+        [Tooltip(
+            "Regex patterns to match sprite file names within this specific folder. All regexes must match (AND logic). e.g., \"^icon_.*\\.png$\""
+        )]
+        public List<string> regexes = new();
+
+        public SourceFolderEntry() { }
+
+        public SourceFolderEntry(string path)
+        {
+            folderPath = path;
+            regexes = new List<string>();
+        }
+    }
+
+    [CreateAssetMenu(
+        fileName = "NewScriptableSpriteAtlas",
+        menuName = "Wallstop Studios/Unity Helpers/Scriptable Sprite Atlas Config"
+    )]
+    public sealed class ScriptableSpriteAtlas : ScriptableObject
+    {
+        [Header("Sprite Sources")]
+        [Tooltip(
+            "Manually added sprites. These will always be included in addition to scanned sprites."
+        )]
+        public List<Sprite> spritesToPack = new();
+
+        [Tooltip("Define folders and their specific regex patterns for finding sprites.")]
+        public List<SourceFolderEntry> sourceFolderEntries = new();
+
+        [Header("Output Atlas Settings")]
+        [Tooltip("Directory where the .spriteatlas asset will be saved. Relative to Assets/.")]
+        public string outputSpriteAtlasDirectory = "Assets/Sprites/SpriteAtlas";
+        public string outputSpriteAtlasName = "MyNewAtlas";
+
+        public string FullOutputPath
+        {
+            get
+            {
+                if (
+                    string.IsNullOrWhiteSpace(outputSpriteAtlasDirectory)
+                    || string.IsNullOrWhiteSpace(outputSpriteAtlasName)
+                )
+                {
+                    return null;
+                }
+
+                return System
+                    .IO.Path.Combine(
+                        outputSpriteAtlasDirectory,
+                        outputSpriteAtlasName + ".spriteatlas"
+                    )
+                    .SanitizePath();
+            }
+        }
+
+        [Header("Packing Settings")]
+        public int maxTextureSize = 16384;
+
+        [Tooltip("Allow Unity to rotate sprites to fit them better.")]
+        public bool enableRotation = true;
+
+        [Tooltip("Padding in pixels between sprites in the atlas.")]
+        public int padding = 4;
+
+        [Tooltip(
+            "Enable Read/Write on the generated atlas texture. Needed for some runtime operations, but increases memory."
+        )]
+        public bool readWriteEnabled = true;
+
+        [Header("Compression Settings")]
+        public bool useCrunchCompression = true;
+
+        [Range(0, 100)]
+        [WShowIf(nameof(useCrunchCompression))]
+        public int crunchCompressionLevel = 50;
+
+        public TextureImporterCompression compression = TextureImporterCompression.Compressed;
+    }
+#endif
+}

package/Editor/Sprites/ScriptableSpriteAtlas.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5a2c530c49c04db98f514086203d1c9d
+timeCreated: 1746910984