From fd7f09feceb7fb199415d66c3809d87a19610040 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Wed, 31 Mar 2021 13:42:59 +0900
Subject: [PATCH] remove RuntimeUnityBuilder.Asset

---
 Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs |  2 --
 Assets/VRM10/Tests.PlayMode/MaterialTests.cs   | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs b/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs
index bc7e83825..a01abb7ae 100644
--- a/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs
+++ b/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs
@@ -22,8 +22,6 @@ namespace UniVRM10
         /// <returns></returns>
         readonly ModelAsset m_asset = new ModelAsset();
 
-        public ModelAsset Asset => m_asset;
-
         UniGLTF.Extensions.VRMC_vrm.VRMC_vrm m_vrm;
 
         public RuntimeUnityBuilder(UniGLTF.GltfParser parser, IEnumerable<(string, UnityEngine.Object)> externalObjectMap = null) : base(parser, externalObjectMap)
diff --git a/Assets/VRM10/Tests.PlayMode/MaterialTests.cs b/Assets/VRM10/Tests.PlayMode/MaterialTests.cs
index 34cf9fb58..5b67dc155 100644
--- a/Assets/VRM10/Tests.PlayMode/MaterialTests.cs
+++ b/Assets/VRM10/Tests.PlayMode/MaterialTests.cs
@@ -16,7 +16,7 @@ namespace UniVRM10.Test
     {
         const string _vrmPath = "Tests/Models/Alicia_vrm-0.51/AliciaSolid_vrm-0.51.vrm";
 
-        private (ModelAsset, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(string path)
+        private (GameObject, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(string path)
         {
             var fi = new FileInfo(_vrmPath);
             var bytes = File.ReadAllBytes(fi.FullName);
@@ -27,7 +27,7 @@ namespace UniVRM10.Test
             return ToUnity(bytes);
         }
 
-        private (ModelAsset, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(byte[] bytes)
+        private (GameObject, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(byte[] bytes)
         {
             // Vrm => Model
             var parser = new UniGLTF.GltfParser();
@@ -36,14 +36,14 @@ namespace UniVRM10.Test
             return ToUnity(parser);
         }
 
-        private (ModelAsset, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(GltfParser parser)
+        private (GameObject, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(GltfParser parser)
         {
             // Model => Unity
             using (var loader = new RuntimeUnityBuilder(parser))
             {
                 loader.Load();
                 loader.DisposeOnGameObjectDestroyed();
-                return (loader.Asset, loader.MaterialFactory.Materials);
+                return (loader.Root, loader.MaterialFactory.Materials);
             }
         }
 
@@ -77,7 +77,7 @@ namespace UniVRM10.Test
         [UnityTest]
         public IEnumerator ColorSpace_UnityBaseColorToLiner()
         {
-            var (assets, materials) = ToUnity(_vrmPath);
+            var (root, materials) = ToUnity(_vrmPath);
             var srcMaterial = materials.First();
             var srcColor = new Color(0.5f, 0.5f, 0.5f, 0.5f);
             var srcGammaColor = srcColor;
@@ -85,7 +85,7 @@ namespace UniVRM10.Test
 
             srcMaterial.Asset.color = srcColor;
 
-            var model = ToVrmModel(assets.Root);
+            var model = ToVrmModel(root);
             var dstMaterial = model.Materials.First(x => x is UnityEngine.Material m && m.name == srcMaterial.Asset.name) as UnityEngine.Material;
 
             EqualColor(srclinerColor, dstMaterial.color);