com.wallstop-studios.unity-helpers 2.0.0-rc76.5 → 2.0.0-rc76.7

package/Editor/Sprites/ScriptableSpriteAtlas.cs

@@ -1,23 +1,93 @@
 namespace WallstopStudios.UnityHelpers.Editor.Sprites
 {
 #if UNITY_EDITOR
+    using System;
     using UnityEngine;
     using System.Collections.Generic;
     using Core.Attributes;
     using Core.Helper;
     using UnityEditor;
 
-    [System.Serializable]
+    [Flags]
+    public enum SpriteSelectionMode
+    {
+        [Obsolete("Please select a valid value")]
+        None = 0,
+        Regex = 1 << 0,
+        Labels = 1 << 1,
+    }
+
+    public enum LabelSelectionMode
+    {
+        [Obsolete("Please select a valid value")]
+        None = 0,
+        All = 1 << 0,
+        AnyOf = 1 << 1,
+    }
+
+    public enum SpriteSelectionBooleanLogic
+    {
+        [Obsolete("Please select a valid value")]
+        None = 0,
+        And = 1 << 0,
+        Or = 1 << 1,
+    }
+
+    [Serializable]
     public sealed class SourceFolderEntry
     {
         [Tooltip("Folder to scan for sprites. Path relative to Assets/.")]
         public string folderPath = "Assets/Sprites/";
 
+        public SpriteSelectionMode selectionMode = SpriteSelectionMode.Regex;
+
+        [WShowIf(
+            nameof(selectionMode),
+            expectedValues = new object[]
+            {
+                SpriteSelectionMode.Regex,
+                SpriteSelectionMode.Regex | SpriteSelectionMode.Labels,
+            }
+        )]
         [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();
 
+        [WShowIf(
+            nameof(selectionMode),
+            expectedValues = new object[]
+            {
+                SpriteSelectionMode.Regex | SpriteSelectionMode.Labels,
+                (SpriteSelectionMode)(-1),
+            }
+        )]
+        public SpriteSelectionBooleanLogic regexAndTagLogic = SpriteSelectionBooleanLogic.And;
+
+        [WShowIf(
+            nameof(selectionMode),
+            expectedValues = new object[]
+            {
+                SpriteSelectionMode.Labels,
+                SpriteSelectionMode.Regex | SpriteSelectionMode.Labels,
+                (SpriteSelectionMode)(-1),
+            }
+        )]
+        public LabelSelectionMode labelSelectionMode = LabelSelectionMode.All;
+
+        [WShowIf(
+            nameof(selectionMode),
+            expectedValues = new object[]
+            {
+                SpriteSelectionMode.Labels,
+                SpriteSelectionMode.Regex | SpriteSelectionMode.Labels,
+                (SpriteSelectionMode)(-1),
+            }
+        )]
+        [Tooltip("Asset labels to include in the folders.")]
+        [StringInList(typeof(Helpers), nameof(Helpers.GetAllSpriteLabelNames))]
+        public List<string> labels = new();
+
         public SourceFolderEntry() { }
 
         public SourceFolderEntry(string path)

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -3,6 +3,7 @@
 #if UNITY_EDITOR
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
     using System.IO;
     using System.Linq;
     using System.Text.RegularExpressions;
@@ -16,6 +17,8 @@
 
     public sealed class ScriptableSpriteAtlasEditor : EditorWindow
     {
+        private readonly Dictionary<ScriptableSpriteAtlas, SerializedObject> _serializedConfigs =
+            new();
         private List<ScriptableSpriteAtlas> _atlasConfigs = new();
         private Vector2 _scrollPosition;
 
@@ -58,6 +61,7 @@
             Dictionary<ScriptableSpriteAtlas, ScanResult> existingScanCache = new(
                 _scanResultsCache
             );
+            _serializedConfigs.Clear();
             _scanResultsCache.Clear();
 
             string[] guids = AssetDatabase.FindAssets("t:ScriptableSpriteAtlas");
@@ -78,6 +82,7 @@
                     {
                         _scanResultsCache[config] = new ScanResult();
                     }
+                    _serializedConfigs.TryAdd(config, newConfig => new SerializedObject(newConfig));
                     _foldoutStates.TryAdd(config, true);
                 }
             }
@@ -155,7 +160,10 @@
                 if (_foldoutStates[config])
                 {
                     using EditorGUI.IndentLevelScope indentScope = new();
-                    SerializedObject serializedConfig = new(config);
+                    SerializedObject serializedConfig = _serializedConfigs.GetOrAdd(
+                        config,
+                        newConfig => new SerializedObject(newConfig)
+                    );
                     serializedConfig.Update();
                     EditorGUI.BeginChangeCheck();
 
@@ -169,6 +177,7 @@
                     );
                     if (EditorGUI.EndChangeCheck())
                     {
+                        serializedConfig.ApplyModifiedProperties();
                         if (
                             !string.IsNullOrWhiteSpace(newAssetName)
                             && newAssetName != currentAssetName
@@ -368,22 +377,18 @@
                         GUILayout.Button(
                             $"Force Uncompressed for {validSpriteCount} Source Sprites in '{config.name}'"
                         )
+                        && EditorUtility.DisplayDialog(
+                            "Force Uncompressed Source Sprites",
+                            $"This will modify the import settings of {validSpriteCount} source sprites currently in the '{config.name}' list.\n\n"
+                                + "- Crunch compression will be disabled.\n"
+                                + "- Texture format for the 'Default' platform will be set to uncompressed (RGBA32 or RGB24).\n\n"
+                                + "This action modifies source asset import settings and may require re-packing atlases. Are you sure?",
+                            "Yes, Modify Source Sprites",
+                            "Cancel"
+                        )
                     )
                     {
-                        if (
-                            EditorUtility.DisplayDialog(
-                                "Force Uncompressed Source Sprites",
-                                $"This will modify the import settings of {validSpriteCount} source sprites currently in the '{config.name}' list.\n\n"
-                                    + "- Crunch compression will be disabled.\n"
-                                    + "- Texture format for the 'Default' platform will be set to uncompressed (RGBA32 or RGB24).\n\n"
-                                    + "This action modifies source asset import settings and may require re-packing atlases. Are you sure?",
-                                "Yes, Modify Source Sprites",
-                                "Cancel"
-                            )
-                        )
-                        {
-                            ForceUncompressedSourceSprites(config);
-                        }
+                        ForceUncompressedSourceSprites(config);
                     }
                     EditorGUI.EndDisabledGroup();
 
@@ -392,19 +397,15 @@
                         GUILayout.Button(
                             $"Generate/Update '{config.outputSpriteAtlasName}.spriteatlas' ONLY"
                         )
+                        && EditorUtility.DisplayDialog(
+                            $"Generate Atlas: {config.name}",
+                            $"This will create or update '{config.outputSpriteAtlasName}.spriteatlas'. Continue?",
+                            "Yes",
+                            "No"
+                        )
                     )
                     {
-                        if (
-                            EditorUtility.DisplayDialog(
-                                $"Generate Atlas: {config.name}",
-                                $"This will create or update '{config.outputSpriteAtlasName}.spriteatlas'. Continue?",
-                                "Yes",
-                                "No"
-                            )
-                        )
-                        {
-                            GenerateSingleAtlas(config);
-                        }
+                        GenerateSingleAtlas(config);
                     }
                 }
                 EditorGUILayout.EndVertical();
@@ -470,18 +471,16 @@
                     string assetPath = AssetDatabase.GUIDToAssetPath(guid);
                     string fileName = Path.GetFileName(assetPath);
 
-                    bool matchesAllRegexesInEntry;
+                    bool matchesAllRegexesInEntry = true;
                     List<string> activeRegexPatterns = entry
                         .regexes.Where(r => !string.IsNullOrWhiteSpace(r))
                         .ToList();
 
-                    if (activeRegexPatterns.Count == 0)
-                    {
-                        matchesAllRegexesInEntry = true;
-                    }
-                    else
+                    if (
+                        entry.selectionMode.HasFlagNoAlloc(SpriteSelectionMode.Regex)
+                        && activeRegexPatterns is { Count: > 0 }
+                    )
                     {
-                        matchesAllRegexesInEntry = true;
                         foreach (string regexPattern in activeRegexPatterns)
                         {
                             try
@@ -503,7 +502,68 @@
                         }
                     }
 
-                    if (matchesAllRegexesInEntry)
+                    bool matchesAllTagsInEntry = true;
+                    if (
+                        entry.selectionMode.HasFlagNoAlloc(SpriteSelectionMode.Labels)
+                        && entry.labels is { Count: > 0 }
+                    )
+                    {
+                        Object mainAsset = AssetDatabase.LoadMainAssetAtPath(assetPath);
+                        if (mainAsset != null)
+                        {
+                            string[] labels = AssetDatabase.GetLabels(mainAsset);
+                            switch (entry.labelSelectionMode)
+                            {
+                                case LabelSelectionMode.All:
+                                {
+                                    matchesAllTagsInEntry = labels.All(label =>
+                                        entry.labels.Contains(label)
+                                    );
+                                    break;
+                                }
+                                case LabelSelectionMode.AnyOf:
+                                {
+                                    matchesAllTagsInEntry = labels.Any(label =>
+                                        entry.labels.Contains(label)
+                                    );
+                                    break;
+                                }
+                                default:
+                                {
+                                    throw new InvalidEnumArgumentException(
+                                        nameof(entry.labelSelectionMode),
+                                        (int)entry.labelSelectionMode,
+                                        typeof(LabelSelectionMode)
+                                    );
+                                }
+                            }
+                        }
+                    }
+
+                    bool allMatch;
+                    switch (entry.regexAndTagLogic)
+                    {
+                        case SpriteSelectionBooleanLogic.And:
+                        {
+                            allMatch = matchesAllRegexesInEntry && matchesAllTagsInEntry;
+                            break;
+                        }
+                        case SpriteSelectionBooleanLogic.Or:
+                        {
+                            allMatch = matchesAllRegexesInEntry || matchesAllTagsInEntry;
+                            break;
+                        }
+                        default:
+                        {
+                            throw new InvalidEnumArgumentException(
+                                nameof(entry.regexAndTagLogic),
+                                (int)entry.regexAndTagLogic,
+                                typeof(SpriteSelectionBooleanLogic)
+                            );
+                        }
+                    }
+
+                    if (allMatch)
                     {
                         Object[] assets = AssetDatabase.LoadAllAssetsAtPath(assetPath);
                         foreach (Object asset in assets)