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

package/Runtime/Core/Random/XorShiftRandom.cs

@@ -2,29 +2,31 @@
 {
     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);
 
-        [DataMember(Name = "State")]
         private uint _state;
 
-        public XorShiftRandom() : this(Guid.NewGuid().GetHashCode())
-        {
-        }
+        public XorShiftRandom()
+            : this(Guid.NewGuid().GetHashCode()) { }
 
         public XorShiftRandom(int state)
         {
             _state = unchecked((uint)state);
         }
 
-        public XorShiftRandom(RandomState state)
+        [JsonConstructor]
+        public XorShiftRandom(RandomState internalState)
         {
-            _state = unchecked((uint)state.State1);
-            _cachedGaussian = state.Gaussian;
+            _state = unchecked((uint)internalState.State1);
+            _cachedGaussian = internalState.Gaussian;
         }
 
         public override uint NextUint()

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

@@ -2,13 +2,13 @@
 {
     using System;
     using System.ComponentModel;
-    using Extension;
-    using JsonConverters;
     using System.IO;
     using System.Runtime.Serialization.Formatters.Binary;
     using System.Text;
     using System.Text.Json;
     using System.Text.Json.Serialization;
+    using Extension;
+    using JsonConverters;
 
     internal static class SerializerEncoding
     {
@@ -30,7 +30,7 @@
                 {
                     new JsonStringEnumConverter(),
                     Vector3Converter.Instance,
-                    Vector2Converter.Instance
+                    Vector2Converter.Instance,
                 },
             };
 
@@ -45,7 +45,7 @@
                 {
                     new JsonStringEnumConverter(),
                     Vector3Converter.Instance,
-                    Vector2Converter.Instance
+                    Vector2Converter.Instance,
                 },
                 WriteIndented = true,
             };
@@ -70,7 +70,10 @@
                     return ProtoDeserialize<T>(serialized);
                 default:
                     throw new InvalidEnumArgumentException(
-                        nameof(serializationType), (int)serializationType, typeof(SerializationType));
+                        nameof(serializationType),
+                        (int)serializationType,
+                        typeof(SerializationType)
+                    );
             }
         }
 
@@ -84,7 +87,10 @@
                     return ProtoSerialize(instance);
                 default:
                     throw new InvalidEnumArgumentException(
-                        nameof(serializationType), (int)serializationType, typeof(SerializationType));
+                        nameof(serializationType),
+                        (int)serializationType,
+                        typeof(SerializationType)
+                    );
             }
         }
 
@@ -123,9 +129,14 @@
             return memoryStream.ToArray();
         }
 
-        public static T JsonDeserialize<T>(string data)
+        public static T JsonDeserialize<T>(string data, Type type = null)
         {
-            return JsonSerializer.Deserialize<T>(data, SerializerEncoding.NormalJsonOptions);
+            return (T)
+                JsonSerializer.Deserialize(
+                    data,
+                    type ?? typeof(T),
+                    SerializerEncoding.NormalJsonOptions
+                );
         }
 
         public static byte[] JsonSerialize<T>(T input)
@@ -135,13 +146,24 @@
 
         public static string JsonStringify<T>(T input, bool pretty = false)
         {
-            JsonSerializerOptions options =
-                pretty ? SerializerEncoding.PrettyJsonOptions : SerializerEncoding.NormalJsonOptions;
-            if (typeof(T) == typeof(object))
+            JsonSerializerOptions options = pretty
+                ? SerializerEncoding.PrettyJsonOptions
+                : SerializerEncoding.NormalJsonOptions;
+            Type parameterType = typeof(T);
+            if (
+                parameterType.IsAbstract
+                || parameterType.IsInterface
+                || parameterType == typeof(object)
+            )
             {
                 object data = input;
-                Type type = data?.GetType();
-                return JsonSerializer.Serialize(data, data?.GetType(), options);
+                if (data == null)
+                {
+                    return "{}";
+                }
+
+                Type type = data.GetType();
+                return JsonSerializer.Serialize(data, type, options);
             }
 
             return JsonSerializer.Serialize(input, options);
@@ -159,4 +181,4 @@
             File.WriteAllText(path, jsonAsText);
         }
     }
-}
+}

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.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

@@ -17,7 +17,7 @@
         public int baseSegments = 4;
         public float updateRateSeconds = 0.1f;
         public Color color = Color.grey;
-        
+
         public Vector3 Offset
         {
             get => _offset;
@@ -26,6 +26,7 @@
 
         [SiblingComponent]
         private CircleCollider2D _collider;
+
         [SiblingComponent]
         private LineRenderer[] _lineRenderers;
 
@@ -70,7 +71,11 @@
 
             if (maxLineWidth < minLineWidth)
             {
-                this.LogWarn("MaxLineWidth {0} smaller than MinLineWidth {1}.", maxLineWidth, minLineWidth);
+                this.LogWarn(
+                    "MaxLineWidth {0} smaller than MinLineWidth {1}.",
+                    maxLineWidth,
+                    minLineWidth
+                );
             }
         }
 
@@ -98,7 +103,10 @@
                 lineRenderer.positionCount = numSegments;
 
                 // ReSharper disable once CompareOfFloatsByEqualityOperator
-                float lineWidth = minLineWidth == maxLineWidth ? minLineWidth : PcgRandom.Instance.NextFloat(minLineWidth, maxLineWidth);
+                float lineWidth =
+                    minLineWidth == maxLineWidth
+                        ? minLineWidth
+                        : PRNG.Instance.NextFloat(minLineWidth, maxLineWidth);
 
                 lineRenderer.startWidth = lineWidth;
                 lineRenderer.endWidth = lineWidth;
@@ -106,12 +114,16 @@
                 float distanceMultiplier = _collider.radius;
 
                 float angle = 360f / numSegments;
-                float offsetRadians = PcgRandom.Instance.NextFloat(angle);
+                float offsetRadians = PRNG.Instance.NextFloat(angle);
                 float currentOffset = offsetRadians;
                 Vector3[] positions = new Vector3[numSegments];
                 for (int i = 0; i < numSegments; ++i)
                 {
-                    positions[i] = new Vector3(Mathf.Cos(Mathf.Deg2Rad * currentOffset), Mathf.Sin(Mathf.Deg2Rad * currentOffset)) * distanceMultiplier;
+                    positions[i] =
+                        new Vector3(
+                            Mathf.Cos(Mathf.Deg2Rad * currentOffset),
+                            Mathf.Sin(Mathf.Deg2Rad * currentOffset)
+                        ) * distanceMultiplier;
                     currentOffset += angle % 360f;
                 }
 

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: