com.wallstop-studios.unity-helpers 2.0.0-rc03 → 2.0.0-rc05

package/Runtime/Core/Random/WyRandom.cs

@@ -0,0 +1,123 @@
+namespace UnityHelpers.Core.Random
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Runtime.CompilerServices;
+    using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
+
+    // https://github.com/cocowalla/wyhash-dotnet/blob/master/src/WyHash/WyRng.cs
+    [Serializable]
+    [DataContract]
+    public sealed class WyRandom : AbstractRandom
+    {
+        private const ulong Prime0 = 0xa0761d6478bd642f;
+        private const ulong Prime1 = 0xe7037ed1a0b428db;
+
+        public static IRandom Instance => ThreadLocalRandom<WyRandom>.Instance;
+
+        [JsonPropertyName("State")]
+        [DataMember(Name = "State")]
+        public override RandomState InternalState => new RandomState(_state);
+
+        private ulong _state;
+
+        public WyRandom()
+            : this(Guid.NewGuid()) { }
+
+        public WyRandom(Guid guid)
+        {
+            byte[] guidArray = guid.ToByteArray();
+            _state = BitConverter.ToUInt64(guidArray, 0);
+        }
+
+        [JsonConstructor]
+        public WyRandom(RandomState randomState)
+        {
+            _state = randomState.State1;
+        }
+
+        public WyRandom(ulong state)
+        {
+            _state = state;
+        }
+
+        public override uint NextUint()
+        {
+            unchecked
+            {
+                _state += Prime0;
+                return (uint)Mum(_state ^ Prime1, _state);
+            }
+        }
+
+        /// <summary>
+        /// Perform a MUM (MUltiply and Mix) operation. Multiplies 2 unsigned 64-bit integers, then combines the
+        /// hi and lo bits of the resulting 128-bit integer using XOR
+        /// </summary>
+        /// <param name="x">First 64-bit integer</param>
+        /// <param name="y">Second 64-bit integer</param>
+        /// <returns>Result of the MUM (MUltiply and Mix) operation</returns>
+        private static ulong Mum(ulong x, ulong y)
+        {
+            (ulong hi, ulong lo) = Multiply64(x, y);
+            return hi ^ lo;
+        }
+
+        /// <summary>
+        /// Multiplies 2 unsigned 64-bit integers, returning the result in 2 ulongs representing the hi and lo bits
+        /// of the resulting 128-bit integer
+        ///
+        /// Source: https://stackoverflow.com/a/51587262/25758, but with a faster lo calculation
+        /// </summary>
+        /// <remarks>
+        /// <seealso cref="System.Numerics.BigInteger"/> can perform multiplication on large integers, but it's
+        /// comparatively slow, and an equivalent method allocates around 360B/call
+        /// </remarks>
+        /// <param name="x">First 64-bit integer</param>
+        /// <param name="y">Second 64-bit integer</param>
+        /// <returns>Product of <paramref name="x"/> and <paramref name="y"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
+        private static unsafe (ulong Hi, ulong Lo) Multiply64(ulong x, ulong y)
+        {
+            ulong hi;
+            ulong lo;
+
+            // Use BMI2 intrinsics where available
+#if NETCOREAPP3_0_OR_GREATER
+            if (System.Runtime.Intrinsics.X86.Bmi2.X64.IsSupported)
+            {
+                hi = System.Runtime.Intrinsics.X86.Bmi2.X64.MultiplyNoFlags(x, y, &lo);
+                return (hi, lo);
+            }
+#endif
+
+            lo = x * y;
+
+            ulong x0 = (uint)x;
+            ulong x1 = x >> 32;
+
+            ulong y0 = (uint)y;
+            ulong y1 = y >> 32;
+
+            ulong p11 = x1 * y1;
+            ulong p01 = x0 * y1;
+            ulong p10 = x1 * y0;
+            ulong p00 = x0 * y0;
+
+            // 64-bit product + two 32-bit values
+            ulong middle = p10 + (p00 >> 32) + (uint)p01;
+
+            // 64-bit product + two 32-bit values
+            hi = p11 + (middle >> 32) + (p01 >> 32);
+
+            return (hi, lo);
+        }
+
+        public override IRandom Copy()
+        {
+            return new WyRandom(_state);
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bdbd63a5a5794111b6f4d3e965137f3f
+timeCreated: 1732479831

package/Runtime/Core/Random/XorShiftRandom.cs

@@ -2,25 +2,29 @@
 {
     using System;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
 
     [Serializable]
+    [DataContract]
     public sealed class XorShiftRandom : AbstractRandom
     {
         public static IRandom Instance => ThreadLocalRandom<XorShiftRandom>.Instance;
-        public override RandomState InternalState => new(_state, 0, _cachedGaussian);
 
+        [JsonPropertyName("State")]
         [DataMember(Name = "State")]
+        public override RandomState InternalState => new(_state, 0, _cachedGaussian);
+
         private uint _state;
 
-        public XorShiftRandom() : this(Guid.NewGuid().GetHashCode())
-        {
-        }
+        public XorShiftRandom()
+            : this(Guid.NewGuid().GetHashCode()) { }
 
         public XorShiftRandom(int state)
         {
             _state = unchecked((uint)state);
         }
 
+        [JsonConstructor]
         public XorShiftRandom(RandomState state)
         {
             _state = unchecked((uint)state.State1);

package/Runtime/Core/Random.meta

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

package/Runtime/Core/Serialization/JsonConverters/Vector2Converter.cs.meta

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

package/Runtime/Core/Serialization/JsonConverters/Vector3Converter.cs.meta

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

package/Runtime/Core/Serialization/JsonConverters.meta

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

package/Runtime/Core/Serialization/Serializer.cs.meta

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

package/Runtime/Core/Serialization.meta

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

package/Runtime/Core/Threading/SingleThreadedThreadPool.cs.meta

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

package/Runtime/Core/Threading.meta

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

package/Runtime/Core.meta

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

package/Runtime/Protobuf-Net.meta

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

package/Runtime/Utils/AnimationEventEqualityComparer.cs.meta

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

package/Runtime/Utils/AnimatorEnumStateMachine.cs

@@ -6,6 +6,7 @@
     using System.Globalization;
     using System.Linq;
     using System.Runtime.Serialization;
+    using System.Text.Json.Serialization;
     using UnityEngine;
 
     /// <summary>
@@ -19,13 +20,20 @@
     {
         private static readonly T[] Values = Enum.GetValues(typeof(T)).OfType<T>().ToArray();
 
-        [IgnoreDataMember] private readonly HashSet<string> _availableBools = new HashSet<string>();
+        [JsonIgnore]
+        [IgnoreDataMember]
+        private readonly HashSet<string> _availableBools = new HashSet<string>();
 
-        [IgnoreDataMember] public readonly Animator Animator;
+        [JsonIgnore]
+        [IgnoreDataMember]
+        public readonly Animator Animator;
 
-        [IgnoreDataMember] private T _value;
+        [JsonIgnore]
+        [IgnoreDataMember]
+        private T _value;
 
         [DataMember]
+        [JsonInclude]
         public T Value
         {
             get { return _value; }
@@ -45,6 +53,7 @@
         }
 
         [DataMember]
+        [JsonInclude]
         private string Type => typeof(T).Name;
 
         public AnimatorEnumStateMachine(Animator animator, T defaultValue = default(T))
@@ -77,4 +86,4 @@
             return this.ToJson();
         }
     }
-}
+}

package/Runtime/Utils/AnimatorEnumStateMachine.cs.meta

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

package/Runtime/Utils/Buffers.cs.meta

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

package/Runtime/Utils/CircleLineRenderer.cs.meta

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

package/Runtime/Utils/Oscillator.cs.meta

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

package/Runtime/Utils/SetTextureImportData.cs.meta

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

package/Runtime/Utils.meta

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

package/Runtime/WallstopStudios.UnityHelpers.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 63a0f107903545b4fae68b24d4dd4b41
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 63a0f107903545b4fae68b24d4dd4b41
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime.meta

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