Merge pull request #911 from ousttrue/feature10/rename_importer_exporter

Feature10/rename importer exporter
vrm-c · Apr 26, 2021 · 40356c1 · 40356c1
2 parents df8b69b + 6d6e812
commit 40356c1
Show file tree

Hide file tree

Showing 30 changed files with 516 additions and 563 deletions.
diff --git a/Assets/VRM10.Samples/Runtime/ViewerUI.cs b/Assets/VRM10.Samples/Runtime/ViewerUI.cs
@@ -311,7 +311,7 @@ void LoadModel(string path)
                         var parser = new UniGLTF.GltfParser();
                         parser.ParsePath(path);
 
-                        using (var loader = new RuntimeUnityBuilder(parser))
+                        using (var loader = new Vrm10Importer(parser))
                         {
                             loader.Load();
                             loader.ShowMeshes();

diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
@@ -38,7 +38,7 @@ public override void OnEnable()
                 m_parser = null;
                 return;
             }
-            m_model = VrmLoader.CreateVrmModel(m_parser);
+            m_model = ModelReader.Read(m_parser);
         }
 
         enum Tabs

diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs
@@ -96,7 +96,7 @@ public static void Import(ScriptedImporter scriptedImporter, AssetImportContext
             //
             var externalObjectMap = scriptedImporter.GetExternalObjectMap().ToDictionary(kv => new SubAssetKey(kv.Key.type, kv.Key.name), kv => kv.Value);
 
-            using (var loader = new RuntimeUnityBuilder(parser, externalObjectMap))
+            using (var loader = new Vrm10Importer(parser, externalObjectMap))
             {
                 // settings TextureImporters
                 foreach (var (key, textureInfo) in Vrm10MaterialImporter.EnumerateAllTexturesDistinct(parser))

diff --git a/Assets/VRM10/Editor/Vrm10ExportDialog.cs b/Assets/VRM10/Editor/Vrm10ExportDialog.cs
@@ -281,7 +281,7 @@ protected override void ExportPath(string path)
 
             try
             {
-                var converter = new UniVRM10.RuntimeVrmConverter();
+                var converter = new UniVRM10.ModelExporter();
                 var model = converter.ToModelFrom10(root);
 
                 if (HumanoidValidator.HasRotationOrScale(root))

diff --git a/Assets/VRM10/Runtime/IO/ComponentBuilder.cs b/Assets/VRM10/Runtime/IO/ComponentBuilder.cs
diff --git a/Assets/VRM10/Runtime/IO/DictionaryExtensions.cs b/Assets/VRM10/Runtime/IO/DictionaryExtensions.cs
diff --git a/Assets/VRM10/Runtime/IO/ExpressionExtensions.cs b/Assets/VRM10/Runtime/IO/ExpressionExtensions.cs
@@ -7,7 +7,7 @@ namespace UniVRM10
 {
     public static class ExpressionExtensions
     {
-        public static UniVRM10.MorphTargetBinding Build10(this MorphTargetBind bind, GameObject root, RuntimeUnityBuilder.ModelMap loader, VrmLib.Model model)
+        public static UniVRM10.MorphTargetBinding Build10(this MorphTargetBind bind, GameObject root, Vrm10Importer.ModelMap loader, VrmLib.Model model)
         {
             var libNode = model.Nodes[bind.Node.Value];
             var node = loader.Nodes[libNode].transform;