From 5d9368f9199b2247ba55cca52bb5a67bf1197860 Mon Sep 17 00:00:00 2001
From: Masataka SUMI <santarh@gmail.com>
Date: Fri, 4 Feb 2022 17:22:58 +0900
Subject: [PATCH] mv Vrm10Utility to Vrm10

---
 Assets/VRM10/Runtime/IO/{Vrm10Utility.cs => Vrm10.cs}        | 5 ++++-
 .../VRM10/Runtime/IO/{Vrm10Utility.cs.meta => Vrm10.cs.meta} | 0
 Assets/VRM10/Runtime/Scenes/Sample.cs                        | 4 ++--
 Assets/VRM10/Tests/MigrationTests.cs                         | 2 +-
 Assets/VRM10/Tests/TestAsset.cs                              | 2 +-
 .../VRM10FirstPersonSample/VRM10RuntimeLoader.cs             | 2 +-
 Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs            | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename Assets/VRM10/Runtime/IO/{Vrm10Utility.cs => Vrm10.cs} (97%)
 rename Assets/VRM10/Runtime/IO/{Vrm10Utility.cs.meta => Vrm10.cs.meta} (100%)

diff --git a/Assets/VRM10/Runtime/IO/Vrm10Utility.cs b/Assets/VRM10/Runtime/IO/Vrm10.cs
similarity index 97%
rename from Assets/VRM10/Runtime/IO/Vrm10Utility.cs
rename to Assets/VRM10/Runtime/IO/Vrm10.cs
index 340d5fdf6..01dba6262 100644
--- a/Assets/VRM10/Runtime/IO/Vrm10Utility.cs
+++ b/Assets/VRM10/Runtime/IO/Vrm10.cs
@@ -6,7 +6,10 @@ using VRMShaders;
 
 namespace UniVRM10
 {
-    public static class Vrm10Utility
+    /// <summary>
+    /// High-level VRM-1.0 loading API.
+    /// </summary>
+    public static class Vrm10
     {
         public delegate void MetaCallback(Texture2D thumbnail, UniGLTF.Extensions.VRMC_vrm.Meta meta1, Migration.Vrm0Meta meta0);
         public static async Task<RuntimeGltfInstance> LoadPathAsync(string path,
diff --git a/Assets/VRM10/Runtime/IO/Vrm10Utility.cs.meta b/Assets/VRM10/Runtime/IO/Vrm10.cs.meta
similarity index 100%
rename from Assets/VRM10/Runtime/IO/Vrm10Utility.cs.meta
rename to Assets/VRM10/Runtime/IO/Vrm10.cs.meta
diff --git a/Assets/VRM10/Runtime/Scenes/Sample.cs b/Assets/VRM10/Runtime/Scenes/Sample.cs
index c5c35bbab..415f2ce5f 100644
--- a/Assets/VRM10/Runtime/Scenes/Sample.cs
+++ b/Assets/VRM10/Runtime/Scenes/Sample.cs
@@ -22,12 +22,12 @@ namespace UniVRM10.Sample
         async void Run()
         {
             var src = new FileInfo(m_vrmPath);
-            var instance = await Vrm10Utility.LoadPathAsync(m_vrmPath, true, true);
+            var instance = await Vrm10.LoadPathAsync(m_vrmPath, true, true);
 
             var exportedBytes = Vrm10Exporter.Export(instance.gameObject);
 
             // Import 1.0
-            var vrm10 = await Vrm10Utility.LoadBytesAsync("tmp.vrm", exportedBytes, false, true);
+            var vrm10 = await Vrm10.LoadBytesAsync("tmp.vrm", exportedBytes, false, true);
             var pos = vrm10.transform.position;
             pos.x += 1.5f;
             vrm10.transform.position = pos;
diff --git a/Assets/VRM10/Tests/MigrationTests.cs b/Assets/VRM10/Tests/MigrationTests.cs
index 62044094e..d60deb448 100644
--- a/Assets/VRM10/Tests/MigrationTests.cs
+++ b/Assets/VRM10/Tests/MigrationTests.cs
@@ -198,7 +198,7 @@ namespace UniVRM10
             {
                 try
                 {
-                    Vrm10Utility.LoadPathAsync(gltf.FullName, true, false).Wait();
+                    Vrm10.LoadPathAsync(gltf.FullName, true, false).Wait();
                 }
                 catch (UnNormalizedException)
                 {
diff --git a/Assets/VRM10/Tests/TestAsset.cs b/Assets/VRM10/Tests/TestAsset.cs
index 9b536d66e..2ee9fe5bf 100644
--- a/Assets/VRM10/Tests/TestAsset.cs
+++ b/Assets/VRM10/Tests/TestAsset.cs
@@ -16,7 +16,7 @@ namespace UniVRM10
 
         public static Vrm10Instance LoadAlicia()
         {
-            var task = Vrm10Utility.LoadPathAsync(AliciaPath, true, true);
+            var task = Vrm10.LoadPathAsync(AliciaPath, true, true);
             task.Wait();
             var instance = task.Result;
 
diff --git a/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs b/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
index f10c429ae..0f507f427 100644
--- a/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
+++ b/Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
@@ -88,7 +88,7 @@ namespace UniVRM10.FirstPersonSample
 
         async Task<RuntimeGltfInstance> LoadAsync(string path)
         {
-            var instance = await Vrm10Utility.LoadPathAsync(path, true, true);
+            var instance = await Vrm10.LoadPathAsync(path, true, true);
 
             // VR用 FirstPerson 設定
             var controller = instance.GetComponent<Vrm10Instance>();
diff --git a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
index 89f606eb3..cb0a1856d 100644
--- a/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
+++ b/Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
@@ -415,7 +415,7 @@ namespace UniVRM10.VRM10Viewer
             }
 
             Debug.LogFormat("{0}", path);
-            var instance = await Vrm10Utility.LoadPathAsync(path, true, m_useNormalization.isOn,
+            var instance = await Vrm10.LoadPathAsync(path, true, m_useNormalization.isOn,
                     awaitCaller: new RuntimeOnlyAwaitCaller(),
                     materialGenerator: GetVrmMaterialDescriptorGenerator(m_useUrpMaterial.isOn),
                     metaCallback: m_texts.UpdateMeta);