Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-07 03:17:25 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

follow material name in migration unlit

Browse Source
This commit is contained in:
Masataka SUMI
2021-10-28 21:51:44 +09:00
parent 75619bd5b2
commit 6c87e1d8d1
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/VRM10/Runtime/Migration/Materials/MigrationLegacyUnlitMaterial.cs
View File

@@ -9,10 +9,11 @@ namespace UniVRM10
/// </summary>
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,

13
Assets/VRM10/Runtime/Migration/Materials/MigrationMaterials.cs
View File

@@ -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);
}
}
}
}