Merge pull request #1551 from ousttrue/fix/awaitcaller

UnitTest の修正
vrm-c · Feb 24, 2022 · 9693708 · 9693708
2 parents 7cb05f0 + e387eb4
commit 9693708
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/Assets/UniGLTF/Runtime/Extensions/UnityExtensions.cs b/Assets/UniGLTF/Runtime/Extensions/UnityExtensions.cs
@@ -42,14 +42,28 @@ public BlendShape(string name, int vertexCount, bool hasPositions, bool hasNorma
             {
                 Positions = new List<Vector3>(vertexCount);
             }
+            else
+            {
+                Positions = new List<Vector3>();
+            }
+
             if (hasNormals)
             {
                 Normals = new List<Vector3>(vertexCount);
             }
+            else
+            {
+                Normals = new List<Vector3>();
+            }
+
             if (hasTangents)
             {
                 Tangents = new List<Vector3>(vertexCount);
             }
+            else
+            {
+                Tangents = new List<Vector3>();
+            }
         }
 
         public List<Vector3> Positions { get; private set; }

diff --git a/Assets/VRM10/Runtime/IO/Vrm10.cs b/Assets/VRM10/Runtime/IO/Vrm10.cs
@@ -44,6 +44,13 @@ public static async Task<Vrm10Instance> LoadPathAsync(
             VrmMetaInformationCallback vrmMetaInformationCallback = null,
             CancellationToken ct = default)
         {
+            if (awaitCaller == null)
+            {
+                awaitCaller = Application.isPlaying
+                    ? (IAwaitCaller)new RuntimeOnlyAwaitCaller()
+                    : (IAwaitCaller)new ImmediateCaller();
+            }
+
             return await LoadAsync(
                 path,
                 System.IO.File.ReadAllBytes(path),
@@ -81,6 +88,13 @@ public static async Task<Vrm10Instance> LoadBytesAsync(
             VrmMetaInformationCallback vrmMetaInformationCallback = null,
             CancellationToken ct = default)
         {
+            if (awaitCaller == null)
+            {
+                awaitCaller = Application.isPlaying
+                    ? (IAwaitCaller)new RuntimeOnlyAwaitCaller()
+                    : (IAwaitCaller)new ImmediateCaller();
+            }
+
             return await LoadAsync(
                 string.Empty,
                 bytes,
@@ -105,7 +119,6 @@ private static async Task<Vrm10Instance> LoadAsync(
             CancellationToken ct)
         {
             ct.ThrowIfCancellationRequested();
-
             if (awaitCaller == null)
             {
                 throw new ArgumentNullException();
@@ -172,6 +185,10 @@ private static async Task<Vrm10Instance> TryLoadingAsVrm10Async(
             CancellationToken ct)
         {
             ct.ThrowIfCancellationRequested();
+            if (awaitCaller == null)
+            {
+                throw new ArgumentNullException();
+            }
 
             var vrm10Data = await awaitCaller.Run(() => Vrm10Data.Parse(gltfData));
             ct.ThrowIfCancellationRequested();
@@ -203,6 +220,10 @@ private static async Task<Vrm10Instance> TryMigratingFromVrm0XAsync(
             CancellationToken ct)
         {
             ct.ThrowIfCancellationRequested();
+            if (awaitCaller == null)
+            {
+                throw new ArgumentNullException();
+            }
 
             Vrm10Data migratedVrm10Data = default;
             MigrationData migrationData = default;
@@ -243,6 +264,10 @@ private static async Task<Vrm10Instance> LoadVrm10DataAsync(
             CancellationToken ct)
         {
             ct.ThrowIfCancellationRequested();
+            if (awaitCaller == null)
+            {
+                throw new ArgumentNullException();
+            }
 
             if (vrm10Data == null)
             {

diff --git a/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs b/Assets/VRM10/Samples~/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
@@ -86,7 +86,7 @@ async void LoadVRMClicked()
 
         async Task<Vrm10Instance> LoadAsync(string path, VRMShaders.IAwaitCaller awaitCaller)
         {
-            var instance = await Vrm10.LoadPathAsync(path);
+            var instance = await Vrm10.LoadPathAsync(path, awaitCaller: awaitCaller);
 
             // VR用 FirstPerson 設定
             await instance.Vrm.FirstPerson.SetupAsync(instance.gameObject, awaitCaller);

diff --git a/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs b/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
@@ -86,7 +86,7 @@ async void LoadVRMClicked()
 
         async Task<Vrm10Instance> LoadAsync(string path, VRMShaders.IAwaitCaller awaitCaller)
         {
-            var instance = await Vrm10.LoadPathAsync(path);
+            var instance = await Vrm10.LoadPathAsync(path, awaitCaller: awaitCaller);
 
             // VR用 FirstPerson 設定
             await instance.Vrm.FirstPerson.SetupAsync(instance.gameObject, awaitCaller);