com.wallstop-studios.unity-helpers 2.0.0-rc81.3 → 2.0.0-rc81.5

package/Editor/PrefabChecker.cs

@@ -24,7 +24,7 @@ namespace WallstopStudios.UnityHelpers.Editor
         private static readonly Dictionary<Type, List<FieldInfo>> ListFieldsByType = new();
         private static readonly Dictionary<Type, List<FieldInfo>> StringFieldsByType = new();
         private static readonly Dictionary<Type, List<FieldInfo>> ObjectFieldsByType = new();
-        private static readonly Dictionary<Type, List<RequireComponent>> RequiredComponentsByType =
+        private static readonly Dictionary<Type, RequireComponent[]> RequiredComponentsByType =
             new();
 
         private readonly List<string> _assetPaths = new();
@@ -486,33 +486,59 @@ namespace WallstopStudios.UnityHelpers.Editor
             List<MonoBehaviour> buffer
         )
         {
-            Transform[] allTransforms = prefabRoot.GetComponentsInChildren<Transform>(true);
-            foreach (Transform transform in allTransforms)
+            using PooledResource<List<Transform>> transformBufferResource =
+                Buffers<Transform>.List.Get();
+            List<Transform> transforms = transformBufferResource.resource;
+            prefabRoot.GetComponentsInChildren(true, transforms);
+            foreach (Transform transform in transforms)
             {
-                MonoBehaviour[] components = transform.GetComponents<MonoBehaviour>();
-                if (
-                    components.Length
-                    == buffer.Count(c => c != null && c.gameObject == transform.gameObject)
-                )
+                using PooledResource<List<MonoBehaviour>> componentBuffer =
+                    Buffers<MonoBehaviour>.List.Get();
+                List<MonoBehaviour> components = componentBuffer.resource;
+                transform.GetComponents(components);
+                int bufferCount = 0;
+                foreach (MonoBehaviour c in components)
+                {
+                    if (c != null && c.gameObject == transform.gameObject)
+                    {
+                        ++bufferCount;
+                    }
+                }
+                if (components.Count == bufferCount)
                 {
                     continue;
                 }
 
-                bool foundInNonNullBuffer = components.Any(buffer.Contains);
+                bool foundInNonNullBuffer = false;
+                foreach (MonoBehaviour c in components)
+                {
+                    if (buffer.Contains(c))
+                    {
+                        foundInNonNullBuffer = true;
+                        break;
+                    }
+                }
+
                 if (foundInNonNullBuffer)
                 {
                     return transform.gameObject;
                 }
 
-                if (components.Length != 0 || !buffer.Exists(c => c == null))
+                if (components.Count != 0 || !buffer.Exists(c => c == null))
                 {
                     continue;
                 }
 
-                HashSet<GameObject> gameObjectsWithComponentsInBuffer = buffer
-                    .Where(c => c != null)
-                    .Select(c => c.gameObject)
-                    .ToHashSet();
+                using PooledResource<HashSet<GameObject>> setResource =
+                    Buffers<GameObject>.HashSet.Get();
+                HashSet<GameObject> gameObjectsWithComponentsInBuffer = setResource.resource;
+                foreach (MonoBehaviour c in buffer)
+                {
+                    if (c != null)
+                    {
+                        gameObjectsWithComponentsInBuffer.Add(c.gameObject);
+                    }
+                }
                 if (!gameObjectsWithComponentsInBuffer.Contains(transform.gameObject))
                 {
                     return transform.gameObject;
@@ -535,7 +561,7 @@ namespace WallstopStudios.UnityHelpers.Editor
                         )
                         .Where(field =>
                             field.IsPublic
-                            || field.GetCustomAttributes(typeof(SerializeField), true).Any()
+                            || field.IsAttributeDefined<SerializeField>(out _, inherit: true)
                         )
                         .ToList()
             );
@@ -597,15 +623,12 @@ namespace WallstopStudios.UnityHelpers.Editor
             int issueCount = 0;
             Type componentType = component.GetType();
 
-            List<RequireComponent> required = RequiredComponentsByType.GetOrAdd(
+            RequireComponent[] required = RequiredComponentsByType.GetOrAdd(
                 componentType,
-                type =>
-                    type.GetCustomAttributes(typeof(RequireComponent), true)
-                        .Cast<RequireComponent>()
-                        .ToList()
+                type => type.GetAllAttributesSafe<RequireComponent>(inherit: true)
             );
 
-            if (required.Count <= 0)
+            if (required.Length <= 0)
             {
                 return issueCount;
             }
@@ -688,9 +711,10 @@ namespace WallstopStudios.UnityHelpers.Editor
                 )
             )
             {
-                bool hasValidateAttribute = field
-                    .GetCustomAttributes(typeof(ValidateAssignmentAttribute), true)
-                    .Any();
+                bool hasValidateAttribute = field.IsAttributeDefined<ValidateAssignmentAttribute>(
+                    out _,
+                    inherit: true
+                );
 
                 if (_onlyCheckNullObjectsWithAttribute && !hasValidateAttribute)
                 {

package/Editor/Sprites/ScriptableSpriteAtlasEditor.cs

@@ -13,6 +13,7 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
     using UnityEditor.U2D;
     using UnityEngine;
     using UnityEngine.U2D;
+    using WallstopStudios.UnityHelpers.Utils;
     using Object = UnityEngine.Object;
 
     public sealed class ScriptableSpriteAtlasEditor : EditorWindow
@@ -806,6 +807,29 @@ namespace WallstopStudios.UnityHelpers.Editor.Sprites
             platformSettings.textureCompression = config.compression;
             atlas.SetPlatformSettings(platformSettings);
 
+            int spriteCount = atlas.spriteCount;
+            using PooledResource<Sprite[]> spriteResource = WallstopArrayPool<Sprite>.Get(
+                spriteCount
+            );
+            Sprite[] sprites = spriteResource.resource;
+            int loaded = atlas.GetSprites(sprites);
+            using PooledResource<List<Sprite>> removeResource = Buffers<Sprite>.List.Get();
+            List<Sprite> toRemove = removeResource.resource;
+
+            for (int i = 0; i < loaded; ++i)
+            {
+                Sprite sprite = sprites[i];
+                if (sprite == null)
+                {
+                    toRemove.Add(sprite);
+                }
+            }
+
+            if (toRemove.Count > 0)
+            {
+                atlas.Remove(toRemove.ToArray<Object>());
+            }
+
             Object[] spritesToAdd = config.spritesToPack.Where(s => s != null).ToArray<Object>();
             if (spritesToAdd.Length > 0)
             {

package/Runtime/Core/Extension/StringExtensions.cs

@@ -1,5 +1,6 @@
 namespace WallstopStudios.UnityHelpers.Core.Extension
 {
+    using System;
     using System.Collections.Generic;
     using System.Text;
     using System.Threading;
@@ -36,6 +37,10 @@ namespace WallstopStudios.UnityHelpers.Core.Extension
 
         public static byte[] GetBytes(this string input)
         {
+            if (string.IsNullOrEmpty(input))
+            {
+                return Array.Empty<byte>();
+            }
             return Encoding.Default.GetBytes(input);
         }
 
@@ -99,6 +104,11 @@ namespace WallstopStudios.UnityHelpers.Core.Extension
 
         public static string ToPascalCase(this string value, string separator = "")
         {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
             int startIndex = 0;
             StringBuilder stringBuilder = StringBuilderCache.Value;
             stringBuilder.Clear();

package/Runtime/Core/Helper/Helpers.cs

@@ -2,6 +2,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System;
     using System.Collections;
+    using System.Collections.Concurrent;
     using System.Collections.Generic;
     using System.Linq;
     using System.Reflection;
@@ -18,7 +19,11 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
     public static partial class Helpers
     {
         private static readonly WaitForEndOfFrame WaitForEndOfFrame = new();
+#if SINGLE_THREADED
         private static readonly Dictionary<Type, MethodInfo> AwakeMethodsByType = new();
+#else
+        private static readonly ConcurrentDictionary<Type, MethodInfo> AwakeMethodsByType = new();
+#endif
         private static readonly Object LogObject = new();
         private static readonly Dictionary<string, Object> ObjectsByTag = new(
             StringComparer.Ordinal
@@ -221,10 +226,23 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
 
         public static GameObject FindChildGameObjectWithTag(this GameObject gameObject, string tag)
         {
-            return gameObject
-                .transform.IterateOverAllChildrenRecursively(includeSelf: true)
-                .Select(t => t.gameObject)
-                .FirstOrDefault(child => child.CompareTag(tag));
+            using PooledResource<List<Transform>> bufferResource = Buffers<Transform>.List.Get();
+            foreach (
+                Transform t in gameObject.transform.IterateOverAllChildrenRecursively(
+                    bufferResource.resource,
+                    includeSelf: true
+                )
+            )
+            {
+                GameObject go = t.gameObject;
+
+                if (go.CompareTag(tag))
+                {
+                    return go;
+                }
+            }
+
+            return null;
         }
 
         public static Coroutine StartFunctionAsCoroutine(
@@ -548,10 +566,22 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
             string tag
         )
         {
-            return gameObject
-                .transform.IterateOverAllChildrenRecursively(includeSelf: true)
-                .Select(t => t.gameObject)
-                .FirstOrDefault(go => go.CompareTag(tag));
+            using PooledResource<List<Transform>> bufferResource = Buffers<Transform>.List.Get();
+            foreach (
+                Transform t in gameObject.transform.IterateOverAllChildrenRecursively(
+                    bufferResource.resource,
+                    includeSelf: true
+                )
+            )
+            {
+                GameObject go = t.gameObject;
+                if (go.CompareTag(tag))
+                {
+                    return go;
+                }
+            }
+
+            return null;
         }
 
         //https://answers.unity.com/questions/722748/refreshing-the-polygon-collider-2d-upon-sprite-cha.html
@@ -559,7 +589,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         {
             if (
                 !component.TryGetComponent(out SpriteRenderer spriteRenderer)
-                || component.TryGetComponent(out PolygonCollider2D collider)
+                || !component.TryGetComponent(out PolygonCollider2D collider)
             )
             {
                 return;
@@ -577,7 +607,8 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
 
             int pathCount = collider.pathCount = sprite.GetPhysicsShapeCount();
 
-            List<Vector2> path = new();
+            using PooledResource<List<Vector2>> pathResource = Buffers<Vector2>.List.Get();
+            List<Vector2> path = pathResource.resource;
             for (int i = 0; i < pathCount; ++i)
             {
                 path.Clear();
@@ -712,15 +743,32 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
 
         public static void AwakeObject(this GameObject gameObject)
         {
-            foreach (MonoBehaviour script in gameObject.GetComponentsInChildren<MonoBehaviour>())
+            using PooledResource<List<MonoBehaviour>> componentResource =
+                Buffers<MonoBehaviour>.List.Get();
+            List<MonoBehaviour> components = componentResource.resource;
+            gameObject.GetComponentsInChildren(false, components);
+            foreach (MonoBehaviour script in components)
             {
                 MethodInfo awakeInfo = AwakeMethodsByType.GetOrAdd(
                     script.GetType(),
                     type =>
-                        type.GetMethod(
-                            "Awake",
+                    {
+                        MethodInfo[] methods = type.GetMethods(
                             BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic
-                        )
+                        );
+                        foreach (MethodInfo method in methods)
+                        {
+                            if (
+                                string.Equals(method.Name, "Awake", StringComparison.Ordinal)
+                                && method.GetParameters().Length == 0
+                            )
+                            {
+                                return method;
+                            }
+                        }
+
+                        return null;
+                    }
                 );
                 if (awakeInfo != null)
                 {

package/Runtime/Core/Helper/Partials/TransformHelpers.cs

@@ -53,8 +53,16 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
                 yield break;
             }
 
-            List<T> buffer = new();
-            foreach (Transform parent in IterateOverAllParents(component, includeSelf))
+            using PooledResource<List<T>> bufferResource = Buffers<T>.List.Get();
+            List<T> buffer = bufferResource.resource;
+            using PooledResource<List<Transform>> transformResource = Buffers<Transform>.List.Get();
+            foreach (
+                Transform parent in IterateOverAllParents(
+                    component,
+                    transformResource.resource,
+                    includeSelf
+                )
+            )
             {
                 parent.GetComponents(buffer);
                 foreach (T c in buffer)
@@ -111,7 +119,8 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
                 yield break;
             }
 
-            List<T> buffer = new();
+            using PooledResource<List<T>> bufferResource = Buffers<T>.List.Get();
+            List<T> buffer = bufferResource.resource;
             if (includeSelf)
             {
                 component.GetComponents(buffer);
@@ -249,11 +258,13 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
                 yield return transform;
             }
 
+            using PooledResource<List<Transform>> transformResource = Buffers<Transform>.List.Get();
             for (int i = 0; i < transform.childCount; ++i)
             {
                 foreach (
                     Transform child in IterateOverAllChildrenRecursively(
                         transform.GetChild(i),
+                        transformResource.resource,
                         includeSelf: true
                     )
                 )
@@ -315,7 +326,8 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
                 yield return transform;
             }
 
-            Queue<Transform> iteration = new();
+            using PooledResource<Queue<Transform>> queueResource = Buffers<Transform>.Queue.Get();
+            Queue<Transform> iteration = queueResource.resource;
             iteration.Enqueue(transform);
             while (iteration.TryDequeue(out Transform current))
             {

package/Runtime/Core/Helper/ReflectionHelpers.cs

@@ -1116,7 +1116,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static TAttribute[] GetAllAttributesSafe<TAttribute>(
-            ICustomAttributeProvider provider,
+            this ICustomAttributeProvider provider,
             bool inherit = true
         )
             where TAttribute : Attribute
@@ -1144,7 +1144,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static Attribute[] GetAllAttributesSafe(
-            ICustomAttributeProvider provider,
+            this ICustomAttributeProvider provider,
             bool inherit = true
         )
         {
@@ -1164,7 +1164,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static Attribute[] GetAllAttributesSafe(
-            ICustomAttributeProvider provider,
+            this ICustomAttributeProvider provider,
             Type attributeType,
             bool inherit = true
         )
@@ -1192,7 +1192,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static Dictionary<string, object> GetAllAttributeValuesSafe(
-            ICustomAttributeProvider provider,
+            this ICustomAttributeProvider provider,
             bool inherit = true
         )
         {
@@ -1222,7 +1222,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static MethodInfo[] GetMethodsWithAttributeSafe<TAttribute>(
-            Type type,
+            this Type type,
             bool inherit = true
         )
             where TAttribute : Attribute
@@ -1251,7 +1251,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static PropertyInfo[] GetPropertiesWithAttributeSafe<TAttribute>(
-            Type type,
+            this Type type,
             bool inherit = true
         )
             where TAttribute : Attribute
@@ -1280,7 +1280,7 @@ namespace WallstopStudios.UnityHelpers.Core.Helper
         }
 
         public static FieldInfo[] GetFieldsWithAttributeSafe<TAttribute>(
-            Type type,
+            this Type type,
             bool inherit = true
         )
             where TAttribute : Attribute

package/package.json

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