com.wallstop-studios.unity-helpers 2.0.0-rc58 → 2.0.0-rc60

package/Runtime/Core/Extension/RandomExtensions.cs

@@ -1,109 +1,109 @@
-namespace UnityHelpers.Core.Extension
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using Helper;
-    using Random;
-    using UnityEngine;
-
-    public static class RandomExtensions
-    {
-        public static Vector2 NextVector2(this IRandom random, float amplitude)
-        {
-            return random.NextVector2(-amplitude, amplitude);
-        }
-
-        public static T NextEnumExcept<T>(this IRandom random, params T[] exceptions)
-            where T : struct, Enum
-        {
-            T value;
-            do
-            {
-                value = random.NextEnum<T>();
-            } while (0 <= Array.IndexOf(exceptions, value));
-
-            return value;
-        }
-
-        public static T NextOfExcept<T>(
-            this IRandom random,
-            IEnumerable<T> values,
-            params T[] exceptions
-        )
-        {
-            T value;
-
-            switch (values)
-            {
-                case IReadOnlyList<T> list:
-                {
-                    do
-                    {
-                        value = random.NextOf(list);
-                    } while (0 <= Array.IndexOf(exceptions, value));
-
-                    break;
-                }
-                case IReadOnlyCollection<T> collection:
-                {
-                    do
-                    {
-                        value = random.NextOf(collection);
-                    } while (0 <= Array.IndexOf(exceptions, value));
-
-                    break;
-                }
-                default:
-                {
-                    T[] input = values.ToArray();
-                    do
-                    {
-                        value = random.NextOf(input);
-                    } while (0 <= Array.IndexOf(exceptions, value));
-
-                    break;
-                }
-            }
-
-            return value;
-        }
-
-        public static Vector2 NextVector2(
-            this IRandom random,
-            float minAmplitude,
-            float maxAmplitude
-        )
-        {
-            float x = random.NextFloat(minAmplitude, maxAmplitude);
-            float y = random.NextFloat(minAmplitude, maxAmplitude);
-            return new Vector2(x, y);
-        }
-
-        public static Vector2 NextVector2InRange(
-            this IRandom random,
-            float range,
-            Vector2? origin = null
-        )
-        {
-            return Helpers.GetRandomPointInCircle(origin ?? Vector2.zero, range, random);
-        }
-
-        public static Vector3 NextVector3(this IRandom random, float amplitude)
-        {
-            return random.NextVector3(-amplitude, amplitude);
-        }
-
-        public static Vector3 NextVector3(
-            this IRandom random,
-            float minAmplitude,
-            float maxAmplitude
-        )
-        {
-            float z = random.NextFloat(minAmplitude, maxAmplitude);
-            Vector3 result = random.NextVector2(minAmplitude, maxAmplitude);
-            result.z = z;
-            return result;
-        }
-    }
-}
+namespace UnityHelpers.Core.Extension
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Helper;
+    using Random;
+    using UnityEngine;
+
+    public static class RandomExtensions
+    {
+        public static Vector2 NextVector2(this IRandom random, float amplitude)
+        {
+            return random.NextVector2(-amplitude, amplitude);
+        }
+
+        public static T NextEnumExcept<T>(this IRandom random, params T[] exceptions)
+            where T : struct, Enum
+        {
+            T value;
+            do
+            {
+                value = random.NextEnum<T>();
+            } while (0 <= Array.IndexOf(exceptions, value));
+
+            return value;
+        }
+
+        public static T NextOfExcept<T>(
+            this IRandom random,
+            IEnumerable<T> values,
+            params T[] exceptions
+        )
+        {
+            T value;
+
+            switch (values)
+            {
+                case IReadOnlyList<T> list:
+                {
+                    do
+                    {
+                        value = random.NextOf(list);
+                    } while (0 <= Array.IndexOf(exceptions, value));
+
+                    break;
+                }
+                case IReadOnlyCollection<T> collection:
+                {
+                    do
+                    {
+                        value = random.NextOf(collection);
+                    } while (0 <= Array.IndexOf(exceptions, value));
+
+                    break;
+                }
+                default:
+                {
+                    T[] input = values.ToArray();
+                    do
+                    {
+                        value = random.NextOf(input);
+                    } while (0 <= Array.IndexOf(exceptions, value));
+
+                    break;
+                }
+            }
+
+            return value;
+        }
+
+        public static Vector2 NextVector2(
+            this IRandom random,
+            float minAmplitude,
+            float maxAmplitude
+        )
+        {
+            float x = random.NextFloat(minAmplitude, maxAmplitude);
+            float y = random.NextFloat(minAmplitude, maxAmplitude);
+            return new Vector2(x, y);
+        }
+
+        public static Vector2 NextVector2InRange(
+            this IRandom random,
+            float range,
+            Vector2? origin = null
+        )
+        {
+            return Helpers.GetRandomPointInCircle(origin ?? Vector2.zero, range, random);
+        }
+
+        public static Vector3 NextVector3(this IRandom random, float amplitude)
+        {
+            return random.NextVector3(-amplitude, amplitude);
+        }
+
+        public static Vector3 NextVector3(
+            this IRandom random,
+            float minAmplitude,
+            float maxAmplitude
+        )
+        {
+            float z = random.NextFloat(minAmplitude, maxAmplitude);
+            Vector3 result = random.NextVector2(minAmplitude, maxAmplitude);
+            result.z = z;
+            return result;
+        }
+    }
+}

package/Runtime/Core/Extension/SerializedPropertyExtensions.cs

@@ -1,157 +1,157 @@
-namespace UnityHelpers.Core.Extension
-{
-#if UNITY_EDITOR
-    using UnityEditor;
-    using System;
-    using System.Reflection;
-
-    public static class SerializedPropertyExtensions
-    {
-        /// <summary>
-        /// Gets the instance object that contains the given SerializedProperty.
-        /// </summary>
-        /// <param name="property">The SerializedProperty.</param>
-        /// <param name="fieldInfo">Outputs the FieldInfo of the referenced field.</param>
-        /// <returns>The instance object that owns the field.</returns>
-        public static object GetEnclosingObject(
-            this SerializedProperty property,
-            out FieldInfo fieldInfo
-        )
-        {
-            fieldInfo = null;
-            object obj = property.serializedObject.targetObject;
-            if (obj == null)
-            {
-                return null;
-            }
-            Type type = obj.GetType();
-            string[] pathParts = property.propertyPath.Split('.');
-
-            // Traverse the path but stop at the second-to-last field
-            for (int i = 0; i < pathParts.Length - 1; ++i)
-            {
-                string fieldName = pathParts[i];
-
-                if (string.Equals(fieldName, "Array", StringComparison.Ordinal))
-                {
-                    // Move to "data[i]", no need to length-check, we're guarded above
-
-                    ++i;
-                    if (
-                        !int.TryParse(
-                            pathParts[i]
-                                .Replace("data[", string.Empty, StringComparison.Ordinal)
-                                .Replace("]", string.Empty, StringComparison.Ordinal),
-                            out int index
-                        )
-                    )
-                    {
-                        // Unexpected, die
-                        fieldInfo = null;
-                        return null;
-                    }
-                    obj = GetElementAtIndex(obj, index);
-                    type = obj?.GetType();
-                    continue;
-                }
-
-                fieldInfo = type?.GetField(
-                    fieldName,
-                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance
-                );
-                if (fieldInfo == null)
-                {
-                    return null;
-                }
-
-                // Move deeper but stop before the last property in the path
-                if (i < pathParts.Length - 2)
-                {
-                    obj = fieldInfo.GetValue(obj);
-                    type = fieldInfo.FieldType;
-                }
-            }
-
-            return obj;
-        }
-
-        /// <summary>
-        /// Gets the FieldInfo and the instance object that owns the field for a given SerializedProperty.
-        /// </summary>
-        /// <param name="property">The SerializedProperty to reflect upon.</param>
-        /// <param name="fieldInfo">Outputs the FieldInfo of the referenced field.</param>
-        /// <returns>The instance object that owns the field.</returns>
-        public static object GetTargetObjectWithField(
-            this SerializedProperty property,
-            out FieldInfo fieldInfo
-        )
-        {
-            fieldInfo = null;
-            object obj = property.serializedObject.targetObject;
-            if (obj == null)
-            {
-                return null;
-            }
-
-            Type type = obj.GetType();
-            string[] pathParts = property.propertyPath.Split('.');
-
-            for (int i = 0; i < pathParts.Length; ++i)
-            {
-                string fieldName = pathParts[i];
-
-                if (string.Equals(fieldName, "Array", StringComparison.Ordinal))
-                {
-                    // Move to "data[i]"
-                    ++i;
-                    if (pathParts.Length <= i)
-                    {
-                        break;
-                    }
-
-                    if (
-                        !int.TryParse(
-                            pathParts[i]
-                                .Replace("data[", string.Empty, StringComparison.Ordinal)
-                                .Replace("]", string.Empty, StringComparison.Ordinal),
-                            out int index
-                        )
-                    )
-                    {
-                        // Unexpected, die
-                        fieldInfo = null;
-                        return null;
-                    }
-                    obj = GetElementAtIndex(obj, index);
-                    type = obj?.GetType();
-                    continue;
-                }
-
-                fieldInfo = type?.GetField(
-                    fieldName,
-                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance
-                );
-                if (fieldInfo == null)
-                {
-                    return null;
-                }
-
-                // Move deeper into the object tree
-                obj = fieldInfo.GetValue(obj);
-                type = fieldInfo.FieldType;
-            }
-
-            return obj;
-        }
-
-        private static object GetElementAtIndex(object obj, int index)
-        {
-            if (obj is System.Collections.IList list && index >= 0 && index < list.Count)
-            {
-                return list[index];
-            }
-            return null;
-        }
-    }
-#endif
-}
+namespace UnityHelpers.Core.Extension
+{
+#if UNITY_EDITOR
+    using UnityEditor;
+    using System;
+    using System.Reflection;
+
+    public static class SerializedPropertyExtensions
+    {
+        /// <summary>
+        /// Gets the instance object that contains the given SerializedProperty.
+        /// </summary>
+        /// <param name="property">The SerializedProperty.</param>
+        /// <param name="fieldInfo">Outputs the FieldInfo of the referenced field.</param>
+        /// <returns>The instance object that owns the field.</returns>
+        public static object GetEnclosingObject(
+            this SerializedProperty property,
+            out FieldInfo fieldInfo
+        )
+        {
+            fieldInfo = null;
+            object obj = property.serializedObject.targetObject;
+            if (obj == null)
+            {
+                return null;
+            }
+            Type type = obj.GetType();
+            string[] pathParts = property.propertyPath.Split('.');
+
+            // Traverse the path but stop at the second-to-last field
+            for (int i = 0; i < pathParts.Length - 1; ++i)
+            {
+                string fieldName = pathParts[i];
+
+                if (string.Equals(fieldName, "Array", StringComparison.Ordinal))
+                {
+                    // Move to "data[i]", no need to length-check, we're guarded above
+
+                    ++i;
+                    if (
+                        !int.TryParse(
+                            pathParts[i]
+                                .Replace("data[", string.Empty, StringComparison.Ordinal)
+                                .Replace("]", string.Empty, StringComparison.Ordinal),
+                            out int index
+                        )
+                    )
+                    {
+                        // Unexpected, die
+                        fieldInfo = null;
+                        return null;
+                    }
+                    obj = GetElementAtIndex(obj, index);
+                    type = obj?.GetType();
+                    continue;
+                }
+
+                fieldInfo = type?.GetField(
+                    fieldName,
+                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance
+                );
+                if (fieldInfo == null)
+                {
+                    return null;
+                }
+
+                // Move deeper but stop before the last property in the path
+                if (i < pathParts.Length - 2)
+                {
+                    obj = fieldInfo.GetValue(obj);
+                    type = fieldInfo.FieldType;
+                }
+            }
+
+            return obj;
+        }
+
+        /// <summary>
+        /// Gets the FieldInfo and the instance object that owns the field for a given SerializedProperty.
+        /// </summary>
+        /// <param name="property">The SerializedProperty to reflect upon.</param>
+        /// <param name="fieldInfo">Outputs the FieldInfo of the referenced field.</param>
+        /// <returns>The instance object that owns the field.</returns>
+        public static object GetTargetObjectWithField(
+            this SerializedProperty property,
+            out FieldInfo fieldInfo
+        )
+        {
+            fieldInfo = null;
+            object obj = property.serializedObject.targetObject;
+            if (obj == null)
+            {
+                return null;
+            }
+
+            Type type = obj.GetType();
+            string[] pathParts = property.propertyPath.Split('.');
+
+            for (int i = 0; i < pathParts.Length; ++i)
+            {
+                string fieldName = pathParts[i];
+
+                if (string.Equals(fieldName, "Array", StringComparison.Ordinal))
+                {
+                    // Move to "data[i]"
+                    ++i;
+                    if (pathParts.Length <= i)
+                    {
+                        break;
+                    }
+
+                    if (
+                        !int.TryParse(
+                            pathParts[i]
+                                .Replace("data[", string.Empty, StringComparison.Ordinal)
+                                .Replace("]", string.Empty, StringComparison.Ordinal),
+                            out int index
+                        )
+                    )
+                    {
+                        // Unexpected, die
+                        fieldInfo = null;
+                        return null;
+                    }
+                    obj = GetElementAtIndex(obj, index);
+                    type = obj?.GetType();
+                    continue;
+                }
+
+                fieldInfo = type?.GetField(
+                    fieldName,
+                    BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance
+                );
+                if (fieldInfo == null)
+                {
+                    return null;
+                }
+
+                // Move deeper into the object tree
+                obj = fieldInfo.GetValue(obj);
+                type = fieldInfo.FieldType;
+            }
+
+            return obj;
+        }
+
+        private static object GetElementAtIndex(object obj, int index)
+        {
+            if (obj is System.Collections.IList list && index >= 0 && index < list.Count)
+            {
+                return list[index];
+            }
+            return null;
+        }
+    }
+#endif
+}