com.wallstop-studios.unity-helpers 2.0.0-rc49 → 2.0.0-rc51

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

@@ -22,8 +22,8 @@
                 throw new JsonException($"Invalid token type {reader.TokenType}");
             }
 
-            float x = 0,
-                y = 0;
+            float x = 0;
+            float y = 0;
 
             while (reader.Read())
             {

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

@@ -22,9 +22,9 @@
                 throw new JsonException($"Invalid token type {reader.TokenType}");
             }
 
-            float x = 0,
-                y = 0,
-                z = 0;
+            float x = 0;
+            float y = 0;
+            float z = 0;
 
             while (reader.Read())
             {

package/Runtime/Core/Serialization/JsonConverters/Vector4Converter.cs

@@ -0,0 +1,88 @@
+namespace UnityHelpers.Core.Serialization.JsonConverters
+{
+    using System;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
+    using UnityEngine;
+
+    public sealed class Vector4Converter : JsonConverter<Vector4>
+    {
+        public static readonly Vector4Converter Instance = new();
+
+        private Vector4Converter() { }
+
+        public override Vector4 Read(
+            ref Utf8JsonReader reader,
+            Type typeToConvert,
+            JsonSerializerOptions options
+        )
+        {
+            if (reader.TokenType != JsonTokenType.StartObject)
+            {
+                throw new JsonException($"Invalid token type {reader.TokenType}");
+            }
+
+            float x = 0;
+            float y = 0;
+            float z = 0;
+            float w = 0;
+
+            while (reader.Read())
+            {
+                if (reader.TokenType == JsonTokenType.EndObject)
+                {
+                    return new Vector4(x, y, z, w);
+                }
+
+                if (reader.TokenType == JsonTokenType.PropertyName)
+                {
+                    string propertyName = reader.GetString();
+                    reader.Read();
+                    switch (propertyName)
+                    {
+                        case "x":
+                        {
+                            x = reader.GetSingle();
+                            break;
+                        }
+                        case "y":
+                        {
+                            y = reader.GetSingle();
+                            break;
+                        }
+                        case "z":
+                        {
+                            z = reader.GetSingle();
+                            break;
+                        }
+                        case "w":
+                        {
+                            w = reader.GetSingle();
+                            break;
+                        }
+                        default:
+                        {
+                            throw new JsonException($"Unknown property: {propertyName}");
+                        }
+                    }
+                }
+            }
+
+            throw new JsonException("Incomplete JSON for Vector4");
+        }
+
+        public override void Write(
+            Utf8JsonWriter writer,
+            Vector4 value,
+            JsonSerializerOptions options
+        )
+        {
+            writer.WriteStartObject();
+            writer.WriteNumber("x", value.x);
+            writer.WriteNumber("y", value.y);
+            writer.WriteNumber("z", value.z);
+            writer.WriteNumber("w", value.w);
+            writer.WriteEndObject();
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 89ed188581124a3abc07f3645220ef56
+timeCreated: 1743568183

package/Runtime/Core/Serialization/Serializer.cs

@@ -32,7 +32,11 @@
                     new JsonStringEnumConverter(),
                     Vector3Converter.Instance,
                     Vector2Converter.Instance,
+                    Vector4Converter.Instance,
+                    Matrix4x4Converter.Instance,
                     TypeConverter.Instance,
+                    GameObjectConverter.Instance,
+                    ColorConverter.Instance,
                 },
             };
 
@@ -48,7 +52,11 @@
                     new JsonStringEnumConverter(),
                     Vector3Converter.Instance,
                     Vector2Converter.Instance,
+                    Vector4Converter.Instance,
+                    Matrix4x4Converter.Instance,
                     TypeConverter.Instance,
+                    GameObjectConverter.Instance,
+                    ColorConverter.Instance,
                 },
                 WriteIndented = true,
             };

package/Runtime/Utils/DeferredDisposalResult.cs

@@ -0,0 +1,19 @@
+namespace UnityHelpers.Utils
+{
+    using System;
+    using System.Threading.Tasks;
+
+    public sealed class DeferredDisposalResult<T>
+    {
+        public T Result { get; }
+        private readonly Func<Task> _disposeAsync;
+
+        public DeferredDisposalResult(T result, Func<Task> disposeAsync)
+        {
+            Result = result;
+            _disposeAsync = disposeAsync;
+        }
+
+        public Task DisposeAsync() => _disposeAsync();
+    }
+}

package/Runtime/Utils/DeferredDisposalResult.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 00dfb26d7b8d468fb709192ddf56e4bf
+timeCreated: 1743970028

package/Tests/Runtime/Helper/SceneHelperTests.cs

@@ -0,0 +1,92 @@
+namespace UnityHelpers.Tests.Helper
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Core.Helper;
+    using NUnit.Framework;
+    using UnityEngine;
+    using UnityEngine.TestTools;
+    using UnityHelpers.Utils;
+
+    public sealed class SceneHelperTests
+    {
+        private readonly List<Func<Task>> _disposalTasks = new();
+
+        [UnityTearDown]
+        public IEnumerator TearDown()
+        {
+            foreach (Task disposal in _disposalTasks.Select(disposalProducer => disposalProducer()))
+            {
+                while (!disposal.IsCompleted)
+                {
+                    yield return null;
+                }
+            }
+
+            _disposalTasks.Clear();
+        }
+
+        [Test]
+        public void GetScenesInBuild()
+        {
+            // This will only pass if you have scenes in your build path
+            string[] scenes = SceneHelper.GetScenesInBuild();
+            Assert.That(scenes, Is.Not.Empty);
+        }
+
+        [Test]
+        public void GetAllScenePaths()
+        {
+            string[] scenePaths = SceneHelper.GetAllScenePaths();
+            Assert.That(scenePaths, Is.Not.Empty);
+            Assert.IsTrue(
+                scenePaths.Any(path => path.Contains("Test1")),
+                string.Join(",", scenePaths)
+            );
+            Assert.IsTrue(
+                scenePaths.Any(path => path.Contains("Test2")),
+                string.Join(",", scenePaths)
+            );
+        }
+
+        [UnityTest]
+        public IEnumerator GetObjectOfTypeInScene()
+        {
+            Task<DeferredDisposalResult<SpriteRenderer>> task =
+                SceneHelper.GetObjectOfTypeInScene<SpriteRenderer>(
+                    @"Packages\com.wallstop-studios.unity-helpers\Tests\Runtime\Scenes\Test1.unity"
+                );
+            while (!task.IsCompleted)
+            {
+                yield return null;
+            }
+            Assert.IsTrue(task.IsCompletedSuccessfully, task.Exception?.ToString() ?? string.Empty);
+
+            _disposalTasks.Add(task.Result.DisposeAsync);
+            SpriteRenderer found = task.Result.Result;
+            Assert.IsTrue(found != null);
+        }
+
+        [UnityTest]
+        public IEnumerator GetAllObjectOfTypeInScene()
+        {
+            Task<DeferredDisposalResult<SpriteRenderer[]>> task =
+                SceneHelper.GetAllObjectsOfTypeInScene<SpriteRenderer>(
+                    @"Packages\com.wallstop-studios.unity-helpers\Tests\Runtime\Scenes\Test1.unity"
+                );
+
+            while (!task.IsCompleted)
+            {
+                yield return null;
+            }
+
+            Assert.IsTrue(task.IsCompletedSuccessfully, task.Exception?.ToString() ?? string.Empty);
+            _disposalTasks.Add(task.Result.DisposeAsync);
+            SpriteRenderer[] found = task.Result.Result;
+            Assert.That(found, Has.Length.EqualTo(7));
+        }
+    }
+}

package/Tests/Runtime/Helper/SceneHelperTests.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 342b5f1eb6ff4986934cf2fa225f34a3
+timeCreated: 1743957199