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

package/Editor/Sprites/SpriteSheetAnimationCreator.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 55327b3f69ee4fde80aba6acb4e233b2
+timeCreated: 1748619699

package/Runtime/Core/Attributes/WShowIfAttribute.cs

@@ -1,16 +1,24 @@
 namespace WallstopStudios.UnityHelpers.Core.Attributes
 {
+    using System;
+    using System.Linq;
     using UnityEngine;
 
     public sealed class WShowIfAttribute : PropertyAttribute
     {
         public readonly string conditionField;
         public readonly bool inverse;
+        public object[] expectedValues;
 
-        public WShowIfAttribute(string conditionField, bool inverse = false)
+        public WShowIfAttribute(
+            string conditionField,
+            bool inverse = false,
+            object[] expectedValues = null
+        )
         {
             this.conditionField = conditionField;
             this.inverse = inverse;
+            this.expectedValues = expectedValues?.ToArray() ?? Array.Empty<object>();
         }
     }
 }

package/Runtime/Core/Extension/IListExtensions.cs

@@ -110,14 +110,20 @@
             switch (inputList)
             {
                 case T[] array:
+                {
                     Array.Sort(array, UnityObjectNameComparer<T>.Instance);
                     return;
+                }
                 case List<T> list:
+                {
                     list.Sort(UnityObjectNameComparer<T>.Instance);
                     return;
+                }
                 default:
+                {
                     inputList.InsertionSort(UnityObjectNameComparer<T>.Instance);
                     break;
+                }
             }
         }
 

package/Runtime/Core/Helper/Helpers.cs

@@ -14,10 +14,7 @@
 #if UNITY_EDITOR
     using UnityEditor;
     using UnityEditorInternal;
-#else
-    using System;
 #endif
-
     public static partial class Helpers
     {
         private static readonly WaitForEndOfFrame WaitForEndOfFrame = new();
@@ -27,6 +24,37 @@
             StringComparer.Ordinal
         );
 
+        internal static string[] AllSpriteLabels;
+
+        public static string[] GetAllSpriteLabelNames()
+        {
+#if UNITY_EDITOR
+            if (AllSpriteLabels != null)
+            {
+                return AllSpriteLabels;
+            }
+
+            SortedSet<string> allLabels = new(StringComparer.Ordinal);
+            string[] guids = AssetDatabase.FindAssets("t:Sprite");
+            foreach (string guid in guids)
+            {
+                string path = AssetDatabase.GUIDToAssetPath(guid);
+                Object asset = AssetDatabase.LoadMainAssetAtPath(path);
+                if (asset == null)
+                {
+                    continue;
+                }
+
+                allLabels.UnionWith(AssetDatabase.GetLabels(asset));
+            }
+
+            AllSpriteLabels = allLabels.ToArray();
+            return AllSpriteLabels;
+#else
+            return Array.Empty<string>();
+#endif
+        }
+
         public static string[] GetAllLayerNames()
         {
 #if UNITY_EDITOR

package/Runtime/Core/Helper/StringInList.cs

@@ -8,27 +8,46 @@
     {
         public delegate string[] GetStringList();
 
+        private bool _shouldRefresh;
+        private string[] _list;
+        private Func<string[]> _getStringList;
+
         public StringInList(params string[] list)
         {
-            List = list;
+            _shouldRefresh = false;
+            _list = list;
         }
 
         public StringInList(Type type, string methodName)
         {
+            _shouldRefresh = true;
             MethodInfo method = type.GetMethod(
                 methodName,
                 BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic
             );
             if (method != null)
             {
-                List = method.Invoke(null, null) as string[];
+                _getStringList = () => method.Invoke(null, null) as string[];
             }
             else
             {
                 Debug.LogError($"NO SUCH METHOD {methodName} FOR {type}");
+                _getStringList = () => Array.Empty<string>();
             }
         }
 
-        public string[] List { get; private set; }
+        public string[] List
+        {
+            get
+            {
+                if (_shouldRefresh)
+                {
+                    return _getStringList();
+                }
+
+                return _list;
+            }
+            private set { _list = value; }
+        }
     }
 }

package/Runtime/Utils/UnityObjectNameComparer.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Text.RegularExpressions;
 #if UNITY_EDITOR
     using UnityEditor;
 #endif
@@ -9,6 +10,10 @@
     public sealed class UnityObjectNameComparer<T> : IComparer<T>
         where T : UnityEngine.Object
     {
+        private static readonly Regex TrailingNumberRegex = new(
+            @"^(.*?)(\d+)$",
+            RegexOptions.Compiled
+        );
         public static readonly UnityObjectNameComparer<T> Instance = new();
 
         private UnityObjectNameComparer() { }
@@ -30,7 +35,7 @@
                 return -1;
             }
 
-            int comparison = string.Compare(x.name, y.name, StringComparison.OrdinalIgnoreCase);
+            int comparison = CompareNatural(x.name, y.name);
             if (comparison != 0)
             {
                 return comparison;
@@ -50,5 +55,45 @@
 
             return comparison;
         }
+
+        private static int CompareNatural(string nameA, string nameB)
+        {
+            Match mA = TrailingNumberRegex.Match(nameA);
+            Match mB = TrailingNumberRegex.Match(nameB);
+
+            bool hasNumberA = mA.Success;
+            bool hasNumberB = mB.Success;
+
+            // If both have trailing numbers, compare prefix then numeric
+            if (hasNumberA && hasNumberB)
+            {
+                string prefixA = mA.Groups[1].Value;
+                string prefixB = mB.Groups[1].Value;
+
+                int prefixCompare = StringComparer.OrdinalIgnoreCase.Compare(prefixA, prefixB);
+                if (prefixCompare != 0)
+                {
+                    return prefixCompare;
+                }
+
+                // same prefix → compare parsed integers
+                int numA = int.Parse(mA.Groups[2].Value);
+                int numB = int.Parse(mB.Groups[2].Value);
+                return numA.CompareTo(numB);
+            }
+            // If only one has a trailing number, treat the one without number as coming first
+
+            if (hasNumberA)
+            {
+                return 1; // B (no number) comes before A
+            }
+
+            if (hasNumberB)
+            {
+                return -1; // A (no number) comes before B
+            }
+            // Neither has a trailing number → pure string compare
+            return StringComparer.OrdinalIgnoreCase.Compare(nameA, nameB);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.wallstop-studios.unity-helpers",
-  "version": "2.0.0-rc76.5",
+  "version": "2.0.0-rc76.7",
   "displayName": "Unity Helpers",
   "description": "Various Unity Helper Library",
   "dependencies": {},
@@ -78,6 +78,8 @@
 
 
 
+
+