com.wallstop-studios.unity-helpers 2.0.0-rc76.8 → 2.0.0-rc77

package/Editor/AssetProcessors/SpriteLabelProcessor.cs

@@ -12,10 +12,6 @@
 
     public sealed class SpriteLabelProcessor : AssetPostprocessor
     {
-        private static readonly Dictionary<string, string[]> CachedLabels = new(
-            StringComparer.OrdinalIgnoreCase
-        );
-
         private static void OnPostprocessAllAssets(
             string[] importedAssets,
             string[] deletedAssets,
@@ -23,7 +19,7 @@
             string[] movedFromAssetPaths
         )
         {
-            bool anyChanged = !CachedLabels.Any();
+            bool anyChanged = !Helpers.CachedLabels.Any();
             InitializeCacheIfNeeded();
 
             foreach (string path in importedAssets)
@@ -51,7 +47,7 @@
 
                 string[] newLabels = AssetDatabase.GetLabels(mainObj);
                 if (
-                    !CachedLabels.TryGetValue(path, out string[] oldLabels)
+                    !Helpers.CachedLabels.TryGetValue(path, out string[] oldLabels)
                     || !AreEqual(oldLabels, newLabels)
                 )
                 {
@@ -62,14 +58,14 @@
                     string[] updated = new string[newLabels.Length];
                     Array.Copy(newLabels, updated, newLabels.Length);
                     anyChanged = true;
-                    CachedLabels[path] = updated;
+                    Helpers.CachedLabels[path] = updated;
                 }
             }
 
             if (anyChanged)
             {
-                Helpers.AllSpriteLabels = CachedLabels
-                    .Values.SelectMany(x => x)
+                Helpers.AllSpriteLabels = Helpers
+                    .CachedLabels.Values.SelectMany(x => x)
                     .Distinct()
                     .Ordered()
                     .ToArray();
@@ -78,23 +74,7 @@
 
         private static void InitializeCacheIfNeeded()
         {
-            if (CachedLabels.Count > 0)
-            {
-                return;
-            }
-
-            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;
-                }
-
-                CachedLabels[path] = AssetDatabase.GetLabels(asset);
-            }
+            _ = Helpers.GetAllSpriteLabelNames();
         }
 
         private static bool AreEqual(string[] a, string[] b)

package/Editor/CustomDrawers/WShowIfPropertyDrawer.cs

@@ -2,15 +2,23 @@
 {
 #if UNITY_EDITOR
     using System;
+    using System.Collections.Generic;
     using System.Reflection;
     using Extensions;
     using UnityEditor;
     using UnityEngine;
     using Core.Attributes;
+    using Core.Extension;
+    using Core.Helper;
 
     [CustomPropertyDrawer(typeof(WShowIfAttribute))]
     public sealed class WShowIfPropertyDrawer : PropertyDrawer
     {
+        private static readonly Dictionary<
+            Type,
+            Dictionary<string, Func<object, object>>
+        > CachedFields = new();
+
         public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
         {
             return !ShouldShow(property) ? 0f : EditorGUI.GetPropertyHeight(property, label, true);
@@ -43,13 +51,38 @@
 
                 // This might not be a unity object, so fall back to reflection
                 object enclosingObject = property.GetEnclosingObject(out _);
-                FieldInfo conditionField = enclosingObject
-                    ?.GetType()
-                    .GetField(
+                if (enclosingObject == null)
+                {
+                    return true;
+                }
+
+                Type type = enclosingObject.GetType();
+                Dictionary<string, Func<object, object>> cachedFields = CachedFields.GetOrAdd(type);
+                if (
+                    !cachedFields.TryGetValue(
+                        showIf.conditionField,
+                        out Func<object, object> accessor
+                    )
+                )
+                {
+                    FieldInfo field = type.GetField(
                         showIf.conditionField,
                         BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic
                     );
-                object fieldValue = conditionField?.GetValue(enclosingObject);
+                    if (field == null)
+                    {
+                        Debug.LogError(
+                            $"Failed to find conditional field {showIf.conditionField} on {type.Name}!"
+                        );
+                        accessor = _ => null;
+                    }
+                    else
+                    {
+                        accessor = ReflectionHelpers.GetFieldGetter(field);
+                    }
+                    cachedFields[showIf.conditionField] = accessor;
+                }
+                object fieldValue = accessor(enclosingObject);
                 if (fieldValue is bool maybeCondition)
                 {
                     return showIf.inverse ? !maybeCondition : maybeCondition;

package/Editor/CustomEditors/SourceFolderEntryDrawer.cs

@@ -6,6 +6,7 @@
     using UnityEngine;
     using UnityEditor;
     using System.Collections.Generic;
+    using Core.Extension;
     using Core.Helper;
 
     [CustomPropertyDrawer(typeof(SourceFolderEntry))]
@@ -324,8 +325,8 @@
                 nameof(SourceFolderEntry.selectionMode)
             );
             SpriteSelectionMode modeValue = (SpriteSelectionMode)modeProp.intValue;
-            bool useRegex = (modeValue & SpriteSelectionMode.Regex) != 0;
-            bool useLabels = (modeValue & SpriteSelectionMode.Labels) != 0;
+            bool useRegex = modeValue.HasFlagNoAlloc(SpriteSelectionMode.Regex);
+            bool useLabels = modeValue.HasFlagNoAlloc(SpriteSelectionMode.Labels);
 
             if (useRegex)
             {

package/Editor/Extensions/SerializedPropertyExtensions.cs

@@ -46,11 +46,11 @@
                 if (string.Equals(fieldName, "Array", StringComparison.Ordinal))
                 {
                     // Move to "data[i]", no need to length-check, we're guarded above
-
                     ++i;
+                    fieldName = pathParts[i];
                     if (
                         !int.TryParse(
-                            pathParts[i]
+                            fieldName
                                 .Replace("data[", string.Empty, StringComparison.Ordinal)
                                 .Replace("]", string.Empty, StringComparison.Ordinal),
                             out int index
@@ -61,15 +61,20 @@
                         fieldInfo = null;
                         return null;
                     }
+
                     obj = GetElementAtIndex(obj, index);
                     type = obj?.GetType();
+                    UpdateField(fieldName, ref fieldInfo);
+
+                    if (i == pathParts.Length - 2)
+                    {
+                        fieldName = pathParts[i + 1];
+                        UpdateField(fieldName, ref fieldInfo);
+                    }
                     continue;
                 }
 
-                fieldInfo = type?.GetField(
-                    fieldName,
-                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance
-                );
+                UpdateField(fieldName, ref fieldInfo);
                 if (fieldInfo == null)
                 {
                     return null;
@@ -83,7 +88,24 @@
                 }
             }
 
+            if (fieldInfo == null)
+            {
+                UpdateField(property.name, ref fieldInfo);
+            }
+
             return obj;
+
+            void UpdateField(string fieldName, ref FieldInfo field)
+            {
+                FieldInfo newField = type?.GetField(
+                    fieldName,
+                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance
+                );
+                if (newField != null)
+                {
+                    field = newField;
+                }
+            }
         }
 
         /// <summary>

package/Editor/Sprites/ScriptableSpriteAtlas.cs

@@ -47,6 +47,7 @@
             {
                 SpriteSelectionMode.Regex,
                 SpriteSelectionMode.Regex | SpriteSelectionMode.Labels,
+                (SpriteSelectionMode)(-1),
             }
         )]
         [Tooltip(
@@ -87,14 +88,6 @@
         [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)
-        {
-            folderPath = path;
-            regexes = new List<string>();
-        }
     }
 
     [CreateAssetMenu(

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -501,6 +501,7 @@
                         }
                     }
 
+                    bool allMatch = matchesAllRegexesInEntry;
                     bool matchesAllTagsInEntry = true;
                     if (
                         entry.selectionMode.HasFlagNoAlloc(SpriteSelectionMode.Labels)
@@ -537,28 +538,27 @@
                                 }
                             }
                         }
-                    }
 
-                    bool allMatch;
-                    switch (entry.regexAndTagLogic)
-                    {
-                        case SpriteSelectionBooleanLogic.And:
-                        {
-                            allMatch = matchesAllRegexesInEntry && matchesAllTagsInEntry;
-                            break;
-                        }
-                        case SpriteSelectionBooleanLogic.Or:
+                        switch (entry.regexAndTagLogic)
                         {
-                            allMatch = matchesAllRegexesInEntry || matchesAllTagsInEntry;
-                            break;
-                        }
-                        default:
-                        {
-                            throw new InvalidEnumArgumentException(
-                                nameof(entry.regexAndTagLogic),
-                                (int)entry.regexAndTagLogic,
-                                typeof(SpriteSelectionBooleanLogic)
-                            );
+                            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)
+                                );
+                            }
                         }
                     }
 
@@ -635,6 +635,8 @@
             if (addedCount > 0)
             {
                 so.ApplyModifiedProperties();
+                config.spritesToPack.SortByName();
+                EditorUtility.SetDirty(config);
                 this.Log($"'{config.name}': Added {addedCount} sprites.");
             }
             else

package/Runtime/Core/Helper/Helpers.cs

@@ -24,6 +24,10 @@
             StringComparer.Ordinal
         );
 
+        internal static readonly Dictionary<string, string[]> CachedLabels = new(
+            StringComparer.OrdinalIgnoreCase
+        );
+
         internal static string[] AllSpriteLabels;
 
         public static string[] GetAllSpriteLabelNames()
@@ -45,7 +49,9 @@
                     continue;
                 }
 
-                allLabels.UnionWith(AssetDatabase.GetLabels(asset));
+                string[] labels = AssetDatabase.GetLabels(asset);
+                CachedLabels[path] = labels;
+                allLabels.UnionWith(labels);
             }
 
             AllSpriteLabels = allLabels.ToArray();

package/package.json

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