com.wallstop-studios.unity-helpers 2.0.0-rc69 → 2.0.0-rc70

package/Editor/TextureResizerWizard.cs

@@ -9,8 +9,8 @@
     using UnityEditor;
     using UnityEngine;
     using UnityEngine.Serialization;
-    using WallstopStudios.UnityHelpers.Core.Extension;
-    using WallstopStudios.UnityHelpers.Core.Helper;
+    using Core.Extension;
+    using Core.Helper;
     using WallstopStudios.UnityHelpers.Utils;
     using Object = UnityEngine.Object;
 
@@ -39,7 +39,7 @@
         public float widthMultiplier = 0.54f;
         public float heightMultiplier = 0.245f;
 
-        [MenuItem("Tools/Unity Helpers/Texture Resizer")]
+        [MenuItem("Tools/Wallstop Studios/Unity Helpers/Texture Resizer")]
         public static void ResizeTextures()
         {
             _ = DisplayWizard<TextureResizerWizard>("Texture Resizer", "Resize");

package/Editor/TextureSettingsApplier.cs

@@ -7,23 +7,23 @@
     using System.Linq;
     using UnityEditor;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Attributes;
-    using WallstopStudios.UnityHelpers.Core.Extension;
+    using Core.Attributes;
+    using Core.Extension;
     using WallstopStudios.UnityHelpers.Utils;
     using Object = UnityEngine.Object;
 
     public sealed class TextureSettingsApplier : ScriptableWizard
     {
-        public bool applyReadOnly = false;
-        public bool isReadOnly = false;
-        public bool applyMipMaps = false;
-        public bool generateMipMaps = false;
-        public bool applyWrapMode = false;
+        public bool applyReadOnly;
+        public bool isReadOnly;
+        public bool applyMipMaps;
+        public bool generateMipMaps;
+        public bool applyWrapMode;
 
         [WShowIf(nameof(applyWrapMode))]
         public TextureWrapMode wrapMode = TextureWrapMode.Clamp;
 
-        public bool applyFilterMode = false;
+        public bool applyFilterMode;
 
         [WShowIf(nameof(applyFilterMode))]
         public FilterMode filterMode = FilterMode.Trilinear;
@@ -42,7 +42,7 @@
         )]
         public List<Object> directories = new();
 
-        [MenuItem("Tools/Unity Helpers/Texture Settings Applier")]
+        [MenuItem("Tools/Wallstop Studios/Unity Helpers/Texture Settings Applier")]
         public static void CreateAnimation()
         {
             _ = DisplayWizard<TextureSettingsApplier>("Texture Settings Directory Applier", "Set");

package/Editor/WShowIfPropertyDrawer.cs

@@ -4,8 +4,8 @@
     using System.Reflection;
     using UnityEditor;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Attributes;
-    using WallstopStudios.UnityHelpers.Core.Extension;
+    using Core.Attributes;
+    using Core.Extension;
 
     [CustomPropertyDrawer(typeof(WShowIfAttribute))]
     public sealed class WShowIfPropertyDrawer : PropertyDrawer

package/Runtime/Core/Attributes/EnumDisplayNameAttribute.cs

@@ -0,0 +1,15 @@
+namespace WallstopStudios.UnityHelpers.Core.Attributes
+{
+    using System;
+
+    [AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
+    public sealed class EnumDisplayNameAttribute : Attribute
+    {
+        public string DisplayName { get; }
+
+        public EnumDisplayNameAttribute(string displayName)
+        {
+            DisplayName = displayName;
+        }
+    }
+}

package/Runtime/Core/Attributes/EnumDisplayNameAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 54bb1abcfa114c6ba1e01504b66bc326
+timeCreated: 1746457791

package/Runtime/Core/Extension/EnumExtensions.cs

@@ -1,7 +1,158 @@
-namespace WallstopStudios.UnityHelpers.Core.Extension
+// ReSharper disable StaticMemberInGenericType
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Reflection;
     using System.Runtime.CompilerServices;
+    using Attributes;
+    using Helper;
+
+    public static class EnumNameCache<T>
+        where T : struct, Enum
+    {
+        private const int MaxDenseRange = 1024;
+
+        private static readonly bool UseDensePacking;
+        private static readonly int Min;
+        private static readonly string[]? DenseNames;
+        private static readonly Dictionary<int, string>? SparseNames;
+
+        static EnumNameCache()
+        {
+            T[] values = Enum.GetValues(typeof(T)).Cast<T>().ToArray();
+            int[] intValues = values.Select(v => Unsafe.As<T, int>(ref v)).ToArray();
+            int min = intValues.Min();
+            int max = intValues.Max();
+            int range = max - min + 1;
+
+            if (range <= MaxDenseRange)
+            {
+                UseDensePacking = true;
+                Min = min;
+                DenseNames = new string[range];
+
+                for (int i = 0; i < values.Length; i++)
+                {
+                    int key = intValues[i] - min;
+                    T value = values[i];
+                    DenseNames[key] = value.ToString("G");
+                }
+            }
+            else
+            {
+                UseDensePacking = false;
+                SparseNames = new Dictionary<int, string>();
+                for (int i = 0; i < values.Length; i++)
+                {
+                    int key = Unsafe.As<T, int>(ref values[i]);
+                    T value = values[i];
+                    string name = value.ToString("G");
+                    SparseNames.TryAdd(key, name);
+                }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static string ToCachedName(T value)
+        {
+            int key = Unsafe.As<T, int>(ref value);
+            if (UseDensePacking)
+            {
+                int idx = key - Min;
+                if ((uint)idx < (uint)DenseNames!.Length)
+                {
+                    return DenseNames[idx];
+                }
+            }
+            else
+            {
+                if (SparseNames!.TryGetValue(key, out string name))
+                {
+                    return name;
+                }
+            }
+
+            return value.ToString();
+        }
+    }
+
+    public static class EnumDisplayNameCache<T>
+        where T : struct, Enum
+    {
+        private const int MaxDenseRange = 1024;
+
+        private static readonly bool UseDensePacking;
+        private static readonly int Min;
+        private static readonly string[]? DenseNames;
+        private static readonly Dictionary<int, string>? SparseNames;
+
+        static EnumDisplayNameCache()
+        {
+            Type type = typeof(T);
+            FieldInfo[] fields = type.GetFields(BindingFlags.Public | BindingFlags.Static);
+            T[] values = fields.Select(f => (T)f.GetValue(null)).ToArray();
+            int[] intValues = values.Select(v => Unsafe.As<T, int>(ref v)).ToArray();
+            int min = intValues.Min();
+            int max = intValues.Max();
+            int range = max - min + 1;
+
+            if (range <= MaxDenseRange)
+            {
+                UseDensePacking = true;
+                Min = min;
+                DenseNames = new string[range];
+
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    int key = intValues[i] - min;
+                    FieldInfo field = fields[i];
+                    string name = field.IsAttributeDefined(out EnumDisplayNameAttribute displayName)
+                        ? displayName.DisplayName
+                        : field.Name;
+                    DenseNames[key] = name;
+                }
+            }
+            else
+            {
+                UseDensePacking = false;
+                SparseNames = new Dictionary<int, string>();
+                for (int i = 0; i < fields.Length; i++)
+                {
+                    int key = Unsafe.As<T, int>(ref values[i]);
+                    FieldInfo field = fields[i];
+                    string name = field.IsAttributeDefined(out EnumDisplayNameAttribute displayName)
+                        ? displayName.DisplayName
+                        : field.Name;
+                    SparseNames.TryAdd(key, name);
+                }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static string ToDisplayName(T value)
+        {
+            int key = Unsafe.As<T, int>(ref value);
+            if (UseDensePacking)
+            {
+                int idx = key - Min;
+                if ((uint)idx < (uint)DenseNames!.Length)
+                {
+                    return DenseNames[idx];
+                }
+            }
+            else
+            {
+                if (SparseNames!.TryGetValue(key, out string name))
+                {
+                    return name;
+                }
+            }
+
+            return value.ToString();
+        }
+    }
 
     public static class EnumExtensions
     {
@@ -14,6 +165,30 @@
             return (valueUnderlying & flagUnderlying) == flagUnderlying;
         }
 
+        public static string ToDisplayName<T>(this T value)
+            where T : unmanaged, Enum
+        {
+            return EnumDisplayNameCache<T>.ToDisplayName(value);
+        }
+
+        public static IEnumerable<string> ToDisplayNames<T>(this IEnumerable<T> enumerable)
+            where T : unmanaged, Enum
+        {
+            return enumerable.Select(value => value.ToDisplayName());
+        }
+
+        public static string ToCachedName<T>(this T value)
+            where T : unmanaged, Enum
+        {
+            return EnumNameCache<T>.ToCachedName(value);
+        }
+
+        public static IEnumerable<string> ToCachedNames<T>(this IEnumerable<T> enumerable)
+            where T : unmanaged, Enum
+        {
+            return enumerable.Select(value => value.ToCachedName());
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static unsafe ulong GetUInt64<T>(T value)
             where T : unmanaged

package/Runtime/Core/Extension/UnityExtensions.cs

@@ -1508,7 +1508,7 @@
             );
         }
 
-        public static void SetColors(this UnityEngine.UI.Slider slider, Color color)
+        public static void SetColors(this Slider slider, Color color)
         {
             ColorBlock block = slider.colors;
 

package/Runtime/Tags/AttributeUtilities.cs

@@ -74,9 +74,8 @@
                 return null;
             }
 
-            return target.TryGetComponent(out EffectHandler effectHandler)
-                ? effectHandler.ApplyEffect(attributeEffect)
-                : null;
+            EffectHandler effectHandler = target.GetGameObject().GetOrAddComponent<EffectHandler>();
+            return effectHandler.ApplyEffect(attributeEffect);
         }
 
         public static void ApplyEffectsNoAlloc(
@@ -89,11 +88,11 @@
                 return;
             }
 
-            if (target == null || !target.TryGetComponent(out EffectHandler effectHandler))
+            if (target == null)
             {
                 return;
             }
-
+            EffectHandler effectHandler = target.GetGameObject().GetOrAddComponent<EffectHandler>();
             foreach (AttributeEffect attributeEffect in attributeEffects)
             {
                 _ = effectHandler.ApplyEffect(attributeEffect);
@@ -105,11 +104,12 @@
             IEnumerable<AttributeEffect> attributeEffects
         )
         {
-            if (target == null || !target.TryGetComponent(out EffectHandler effectHandler))
+            if (target == null)
             {
                 return;
             }
 
+            EffectHandler effectHandler = target.GetGameObject().GetOrAddComponent<EffectHandler>();
             foreach (AttributeEffect attributeEffect in attributeEffects)
             {
                 _ = effectHandler.ApplyEffect(attributeEffect);
@@ -122,11 +122,12 @@
             List<EffectHandle> effectHandles
         )
         {
-            if (target == null || !target.TryGetComponent(out EffectHandler effectHandler))
+            if (target == null)
             {
                 return;
             }
 
+            EffectHandler effectHandler = target.GetGameObject().GetOrAddComponent<EffectHandler>();
             foreach (AttributeEffect attributeEffect in attributeEffects)
             {
                 EffectHandle? handle = effectHandler.ApplyEffect(attributeEffect);

package/Runtime/Tags/EffectHandler.cs

@@ -10,9 +10,10 @@
     using Utils;
 
     [DisallowMultipleComponent]
+    [RequireComponent(typeof(TagHandler))]
     public sealed class EffectHandler : MonoBehaviour
     {
-        [SiblingComponent(optional = true)]
+        [SiblingComponent()]
         private TagHandler _tagHandler;
 
         [SiblingComponent(optional = true)]

package/Tests/Runtime/DataStructures/BalancedKDTreeTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.DataStructures
 {
     using System.Collections.Generic;
+    using Core.DataStructure;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public sealed class BalancedKDTreeTests : SpatialTreeTests<KDTree<Vector2>>
     {

package/Tests/Runtime/DataStructures/CyclicBufferTests.cs

@@ -3,8 +3,8 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Core.DataStructure;
     using NUnit.Framework;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
     using WallstopStudios.UnityHelpers.Core.Random;
 
     public sealed class CyclicBufferTests

package/Tests/Runtime/DataStructures/QuadTreeTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.DataStructures
 {
     using System.Collections.Generic;
+    using Core.DataStructure;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public sealed class QuadTreeTests : SpatialTreeTests<QuadTree<Vector2>>
     {

package/Tests/Runtime/DataStructures/UnbalancedKDTreeTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.DataStructures
 {
     using System.Collections.Generic;
+    using Core.DataStructure;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public sealed class UnbalancedKDTreeTests : SpatialTreeTests<KDTree<Vector2>>
     {

package/Tests/Runtime/Extensions/DictionaryExtensionTests.cs

@@ -2,8 +2,8 @@
 {
     using System.Collections.Generic;
     using System.Linq;
+    using Core.Extension;
     using NUnit.Framework;
-    using WallstopStudios.UnityHelpers.Core.Extension;
 
     public sealed class DictionaryExtensionTests
     {

package/Tests/Runtime/Extensions/EnumExtensionTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.Extensions
 {
+    using Core.Extension;
     using NUnit.Framework;
     using UnityEngine.TestTools.Constraints;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using Is = NUnit.Framework.Is;
 
     public sealed class EnumExtensionTests

package/Tests/Runtime/Extensions/IListExtensionTests.cs

@@ -3,8 +3,8 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Core.Extension;
     using NUnit.Framework;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Core.Random;
 
     public sealed class IListExtensionTests

package/Tests/Runtime/Extensions/LoggingExtensionTests.cs

@@ -3,9 +3,9 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Core.Extension;
     using NUnit.Framework;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Core.Helper.Logging;
 

package/Tests/Runtime/Extensions/RandomExtensionTests.cs

@@ -1,9 +1,9 @@
 namespace WallstopStudios.UnityHelpers.Tests.Extensions
 {
     using System.Collections.Generic;
+    using Core.Extension;
     using NUnit.Framework;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Core.Random;
 
     public sealed class RandomExtensionTests

package/Tests/Runtime/Extensions/StringExtensionTests.cs

@@ -1,7 +1,7 @@
 namespace WallstopStudios.UnityHelpers.Tests.Extensions
 {
+    using Core.Extension;
     using NUnit.Framework;
-    using WallstopStudios.UnityHelpers.Core.Extension;
 
     public sealed class StringExtensionTests
     {

package/Tests/Runtime/Helper/WallMathTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.Helper
 {
+    using Core.Extension;
     using NUnit.Framework;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Core.Random;
 

package/Tests/Runtime/Performance/KDTreePerformanceTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.Performance
 {
     using System.Collections.Generic;
+    using Core.DataStructure;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public sealed class KDTreePerformanceTests : SpatialTreePerformanceTest<KDTree<Vector2>>
     {

package/Tests/Runtime/Performance/QuadTreePerformanceTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.Performance
 {
     using System.Collections.Generic;
+    using Core.DataStructure;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public sealed class QuadTreePerformanceTests : SpatialTreePerformanceTest<QuadTree<Vector2>>
     {

package/Tests/Runtime/Performance/SpatialTreePerformanceTest.cs

@@ -6,10 +6,10 @@
     using System.Diagnostics;
     using System.Linq;
     using System.Threading.Tasks;
+    using Core.DataStructure;
     using NUnit.Framework;
     using UnityEngine;
     using UnityEngine.TestTools;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public abstract class SpatialTreePerformanceTest<TTree>
         where TTree : ISpatialTree<Vector2>

package/Tests/Runtime/Performance/UnbalancedKDTreeTests.cs

@@ -1,8 +1,8 @@
 namespace WallstopStudios.UnityHelpers.Tests.Performance
 {
     using System.Collections.Generic;
+    using Core.DataStructure;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.DataStructure;
 
     public sealed class UnbalancedKDTreeTests : SpatialTreePerformanceTest<KDTree<Vector2>>
     {

package/Tests/Runtime/Random/RandomTestBase.cs

@@ -4,9 +4,9 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Runtime.CompilerServices;
+    using Core.DataStructure.Adapters;
+    using Core.Extension;
     using NUnit.Framework;
-    using WallstopStudios.UnityHelpers.Core.DataStructure.Adapters;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Core.Random;
     using WallstopStudios.UnityHelpers.Core.Serialization;
 

package/Tests/Runtime/Serialization/JsonSerializationTest.cs

@@ -5,9 +5,9 @@
     using System.Linq;
     using System.Runtime.Serialization;
     using System.Text.Json.Serialization;
+    using Core.Extension;
     using NUnit.Framework;
     using UnityEngine;
-    using WallstopStudios.UnityHelpers.Core.Extension;
     using WallstopStudios.UnityHelpers.Core.Helper;
     using WallstopStudios.UnityHelpers.Core.Random;
     using WallstopStudios.UnityHelpers.Core.Serialization;

package/package.json

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