From 6c87e1d8d1b812da24e87fbcfb0b9141d1da3750 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 28 Oct 2021 21:51:44 +0900 Subject: [PATCH] follow material name in migration unlit --- .../Materials/MigrationLegacyUnlitMaterial.cs | 3 ++- .../Migration/Materials/MigrationMaterials.cs | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationLegacyUnlitMaterial.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationLegacyUnlitMaterial.cs index e50641579..7ad5c057e 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationLegacyUnlitMaterial.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationLegacyUnlitMaterial.cs @@ -9,10 +9,11 @@ namespace UniVRM10 /// public static class MigrationLegacyUnlitMaterial { - public static glTFMaterial Migrate(JsonNode vrm0XMaterial) + public static glTFMaterial Migrate(JsonNode vrm0XMaterial, string materialName) { var unlitMaterial = new glTFMaterial { + name = materialName, pbrMetallicRoughness = new glTFPbrMetallicRoughness { metallicFactor = 0f, diff --git a/Assets/VRM10/Runtime/Migration/Materials/MigrationMaterials.cs b/Assets/VRM10/Runtime/Migration/Materials/MigrationMaterials.cs index 700432fce..33e5982cf 100644 --- a/Assets/VRM10/Runtime/Migration/Materials/MigrationMaterials.cs +++ b/Assets/VRM10/Runtime/Migration/Materials/MigrationMaterials.cs @@ -27,7 +27,7 @@ namespace UniVRM10 } // 2. VRM 拡張のうち、古い Unlit 情報からの取得を試みる. - var unlitMaterial = MigrationLegacyUnlitMaterial.Migrate(vrm0XMaterial); + var unlitMaterial = MigrationLegacyUnlitMaterial.Migrate(vrm0XMaterial, gltf.materials[materialIdx].name); if (unlitMaterial != null) { gltf.materials[materialIdx] = unlitMaterial; @@ -40,8 +40,15 @@ namespace UniVRM10 } } - // 3. VRM 拡張のうち、MToon 情報からの取得を試みる. - MigrationMToonMaterial.Migrate(gltf, vrm0); + try + { + // 3. VRM 拡張のうち、MToon 情報からの取得を試みる. + MigrationMToonMaterial.Migrate(gltf, vrm0); + } + catch (Exception ex) + { + Debug.LogException(ex); + } } } } \ No newline at end of file