com.wallstop-studios.unity-helpers 2.0.0-rc04 → 2.0.0-rc06

package/Runtime/Core/Helper/WallMath.cs

@@ -14,7 +14,9 @@
 
         public static double BoundedDouble(double max, double value)
         {
-            return value < max ? value : BitConverter.Int64BitsToDouble(BitConverter.DoubleToInt64Bits(value) - 1);
+            return value < max
+                ? value
+                : BitConverter.Int64BitsToDouble(BitConverter.DoubleToInt64Bits(value) - 1);
         }
 
         public static float BoundedFloat(float max, float value)
@@ -22,52 +24,113 @@
             return value < max
                 ? value
                 : BitConverter.ToSingle(
-                    BitConverter.GetBytes(BitConverter.ToInt32(BitConverter.GetBytes(value), 0) - 1), 0);
+                    BitConverter.GetBytes(
+                        BitConverter.ToInt32(BitConverter.GetBytes(value), 0) - 1
+                    ),
+                    0
+                );
         }
 
-        public static int WrappedAdd(int value, int increment, int max)
+        public static int WrappedAdd(this int value, int increment, int max)
         {
             WrappedAdd(ref value, increment, max);
             return value;
         }
 
-        public static void WrappedAdd(ref int value, int increment, int max)
+        public static int WrappedAdd(ref int value, int increment, int max)
         {
-            value = value + increment;
+            value += increment;
             if (value < max)
             {
-                return;
+                return value;
             }
-            value %= max;
+            return value %= max;
         }
 
-        public static int WrappedIncrement(int value, int max)
+        public static int WrappedIncrement(this int value, int max)
         {
             return WrappedAdd(value, 1, max);
         }
 
-        public static void WrappedIncrement(ref int value, int max)
+        public static int WrappedIncrement(ref int value, int max)
+        {
+            return WrappedAdd(ref value, 1, max);
+        }
+
+        public static T Clamp<T>(this T value, T min, T max)
+            where T : IComparable<T>
+        {
+            if (value.CompareTo(min) < 0)
+            {
+                return min;
+            }
+
+            return max.CompareTo(value) < 0 ? max : value;
+        }
+
+        public static Vector2 Clamp(this Rect bounds, Vector2 point)
         {
-            WrappedAdd(ref value, 1, max);
+            return Clamp(bounds, ref point);
         }
 
-        public static void Clamp(this Rect bounds, ref Vector2 point)
+        public static Vector2 Clamp(this Rect bounds, ref Vector2 point)
         {
-            if (!bounds.Contains(point))
+            if (bounds.Contains(point))
+            {
+                return point;
+            }
+
+            Vector2 center = bounds.center;
+            Vector2 direction = point - center;
+
+            if (direction == Vector2.zero)
+            {
+                return center;
+            }
+
+            float tMax = float.MaxValue;
+            Vector2 min = bounds.min;
+            Vector2 max = bounds.max;
+
+            if (direction.x != 0)
+            {
+                if (0 < direction.x)
+                {
+                    float t2 = (max.x - center.x) / direction.x;
+                    tMax = Math.Min(tMax, t2);
+                }
+                else
+                {
+                    float t1 = (min.x - center.x) / direction.x;
+                    tMax = Math.Min(tMax, t1);
+                }
+            }
+
+            if (direction.y != 0)
             {
-                Vector2 xClamp = bounds.width < 0 ?
-                    new Vector2(bounds.x + bounds.width, bounds.x) :
-                    new Vector2(bounds.x, bounds.x + bounds.width);
-                Vector2 yClamp = bounds.height < 0 ?
-                    new Vector2(bounds.y + bounds.height, bounds.y) :
-                    new Vector2(bounds.y, bounds.y + bounds.height);
-
-                point.x = Mathf.Clamp(point.x, xClamp.x, xClamp.y);
-                point.y = Mathf.Clamp(point.y, yClamp.x, yClamp.y);
+                if (direction.y > 0)
+                {
+                    float t2 = (max.y - center.y) / direction.y;
+                    tMax = Math.Min(tMax, t2);
+                }
+                else
+                {
+                    float t1 = (min.y - center.y) / direction.y;
+                    tMax = Math.Min(tMax, t1);
+                }
             }
+
+            tMax = Mathf.Clamp01(tMax);
+
+            point = center + direction * tMax;
+            point = new Vector2(
+                Mathf.Clamp(point.x, min.x, max.x),
+                Mathf.Clamp(point.y, min.y, max.y)
+            );
+            return point;
         }
 
-        public static bool Approximately(float lhs, float rhs, float tolerance = 0.045f)
+        public static bool Approximately(this float lhs, float rhs, float tolerance = 0.045f)
         {
             return Math.Abs(lhs - rhs) <= tolerance;
         }

package/Runtime/Core/Helper/WallMath.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: e3e4af682073d054489c5cb1fe1c5b5a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: e3e4af682073d054489c5cb1fe1c5b5a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Helper.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 63459188a950ba74db1e2d843839f821
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 63459188a950ba74db1e2d843839f821
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Math/Line.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 806e572a2d471104f8b68b9ecc4bd919
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 806e572a2d471104f8b68b9ecc4bd919
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Math/Parabola.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 378ba2f7355b4b148986cd42bc9813df
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 378ba2f7355b4b148986cd42bc9813df
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Math/Range.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: d0976d7d8aebfeb4db8f058c5e803057
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: d0976d7d8aebfeb4db8f058c5e803057
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Math.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: adcccded420bef24ab8fd609fb00feb0
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: adcccded420bef24ab8fd609fb00feb0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Model/Direction.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 09b76f49035ddaf40948ba4cc4ebf959
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 09b76f49035ddaf40948ba4cc4ebf959
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Model.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 6448620daa761f54bbcd28028fcec20f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 6448620daa761f54bbcd28028fcec20f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/OneOf/FastOneOf.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 0aeb8725615721e42b22eb8ff560abb3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 0aeb8725615721e42b22eb8ff560abb3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/OneOf/None.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 7bd7c572f1e481541839edaf4d39b8eb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 7bd7c572f1e481541839edaf4d39b8eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/OneOf.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: f34b22dccaf2c534283095976d8ffe81
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: f34b22dccaf2c534283095976d8ffe81
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Random/AbstractRandom.cs

@@ -5,6 +5,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
     using DataStructure.Adapters;
     using UnityEngine;
 
@@ -30,8 +31,7 @@
             do
             {
                 result = unchecked((int)NextUint());
-            }
-            while (result < 0);
+            } while (result < 0);
 
             return result;
         }
@@ -50,7 +50,9 @@
         {
             if (max <= min)
             {
-                throw new ArgumentException($"Min {min} cannot be larger-than or equal-to max {max}");
+                throw new ArgumentException(
+                    $"Min {min} cannot be larger-than or equal-to max {max}"
+                );
             }
 
             uint range = unchecked((uint)(max - min));
@@ -83,7 +85,9 @@
         {
             if (max <= min)
             {
-                throw new ArgumentException($"Min {min} cannot be larger-than or equal-to max {max}");
+                throw new ArgumentException(
+                    $"Min {min} cannot be larger-than or equal-to max {max}"
+                );
             }
 
             return min + NextUint(max - min);
@@ -147,8 +151,7 @@
             do
             {
                 withinRange = NextLong();
-            }
-            while (withinRange < 0 || max <= withinRange);
+            } while (withinRange < 0 || max <= withinRange);
             return withinRange;
         }
 
@@ -156,7 +159,9 @@
         {
             if (max <= min)
             {
-                throw new ArgumentException($"Min {min} cannot be larger-than or equal-to Max {max}");
+                throw new ArgumentException(
+                    $"Min {min} cannot be larger-than or equal-to Max {max}"
+                );
             }
 
             return min + NextLong(max - min);
@@ -176,7 +181,9 @@
         {
             if (max <= min)
             {
-                throw new ArgumentException($"Min {min} cannot be larger-than or equal-to max {max}");
+                throw new ArgumentException(
+                    $"Min {min} cannot be larger-than or equal-to max {max}"
+                );
             }
 
             return unchecked((ulong)NextLong(unchecked((long)min), unchecked((long)max)));
@@ -227,8 +234,7 @@
             do
             {
                 value = NextUint() * MagicDouble;
-            }
-            while (value < 0 || 1 <= value);
+            } while (value < 0 || 1 <= value);
 
             return value;
         }
@@ -247,7 +253,9 @@
         {
             if (max <= min)
             {
-                throw new ArgumentException($"Min {min} cannot be larger-than or equal-to max {max}");
+                throw new ArgumentException(
+                    $"Min {min} cannot be larger-than or equal-to max {max}"
+                );
             }
 
             double range = max - min;
@@ -277,8 +285,7 @@
                 x = 2 * NextDouble() - 1;
                 y = 2 * NextDouble() - 1;
                 square = x * x + y * y;
-            }
-            while (square > 1 || square == 0);
+            } while (square > 1 || square == 0);
 
             double fac = Math.Sqrt(-2 * Math.Log(square) / square);
             _cachedGaussian = x * fac;
@@ -292,8 +299,7 @@
             {
                 uint floatAsInt = NextUint();
                 value = (floatAsInt >> 8) * MagicFloat;
-            }
-            while (value < 0 || 1 <= value);
+            } while (value < 0 || 1 <= value);
 
             return value;
         }
@@ -312,7 +318,9 @@
         {
             if (max <= min)
             {
-                throw new ArgumentException($"Min {min} cannot be larger-than or equal-to max {max}");
+                throw new ArgumentException(
+                    $"Min {min} cannot be larger-than or equal-to max {max}"
+                );
             }
 
             return min + NextFloat(max - min);
@@ -397,7 +405,8 @@
             }
         }
 
-        public T Next<T>() where T : struct, Enum
+        public T Next<T>()
+            where T : struct, Enum
         {
             Type enumType = typeof(T);
             T[] enumValues;
@@ -413,7 +422,8 @@
             return RandomOf(enumValues);
         }
 
-        public T NextCachedEnum<T>() where T : struct, Enum
+        public T NextCachedEnum<T>()
+            where T : struct, Enum
         {
             Type enumType = typeof(T);
             T[] enumValues = (T[])EnumTypeCache.GetOrAdd(enumType, Enum.GetValues);
@@ -511,7 +521,11 @@
                 {
                     // Returns a value between 0f and 1f based on noiseMap value
                     // minNoiseHeight being 0f, and maxNoiseHeight being 1f
-                    noiseMap[x, y] = Mathf.InverseLerp(minNoiseHeight, maxNoiseHeight, noiseMap[x, y]);
+                    noiseMap[x, y] = Mathf.InverseLerp(
+                        minNoiseHeight,
+                        maxNoiseHeight,
+                        noiseMap[x, y]
+                    );
                 }
             }
             return noiseMap;
@@ -534,4 +548,4 @@
 
         public abstract IRandom Copy();
     }
-}
+}

package/Runtime/Core/Random/AbstractRandom.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 7a01d87ed7d46ae439a1ad70cd477704
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 7a01d87ed7d46ae439a1ad70cd477704
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Random/DotNetRandom.cs

@@ -0,0 +1,52 @@
+namespace UnityHelpers.Core.Random
+{
+    using System;
+    using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
+
+    [Serializable]
+    [DataContract]
+    public sealed class DotNetRandom : AbstractRandom
+    {
+        public override RandomState InternalState =>
+            new RandomState(unchecked((ulong)_seed), state2: _numberGenerated);
+
+        private ulong _numberGenerated;
+        private int _seed;
+        private Random _random;
+
+        public DotNetRandom()
+            : this(Guid.NewGuid()) { }
+
+        public DotNetRandom(Guid guid)
+        {
+            _seed = guid.GetHashCode();
+            _random = new Random(_seed);
+        }
+
+        [JsonConstructor]
+        public DotNetRandom(RandomState internalState)
+        {
+            _seed = unchecked((int)internalState.State1);
+            _random = new Random(_seed);
+            _numberGenerated = 0;
+            ulong generationCount = internalState.State2;
+
+            while (_numberGenerated < generationCount)
+            {
+                _ = NextUint();
+            }
+        }
+
+        public override uint NextUint()
+        {
+            ++_numberGenerated;
+            return unchecked((uint)_random.Next(int.MinValue, int.MaxValue));
+        }
+
+        public override IRandom Copy()
+        {
+            return new DotNetRandom(InternalState);
+        }
+    }
+}

package/Runtime/Core/Random/DotNetRandom.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a01f07b12a4e4da0b9d41986ff6a6c43
+timeCreated: 1732481642

package/Runtime/Core/Random/IRandom.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: ddc39031f4659de4bbdd61deab3d299a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: ddc39031f4659de4bbdd61deab3d299a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Random/NativePcgRandom.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 738be60c0f0a5ad428b38b79c266f408
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 738be60c0f0a5ad428b38b79c266f408
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Core/Random/PRNG.cs

@@ -0,0 +1,7 @@
+namespace UnityHelpers.Core.Random
+{
+    public static class PRNG
+    {
+        public static IRandom Instance => PcgRandom.Instance;
+    }
+}