Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-13 14:04:29 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

satisfy emissiveFactor spec

Browse Source
This commit is contained in:
Masataka SUMI 2022-11-07 19:21:47 +09:00
parent 5b95b6e1ae
commit 2eefacbde3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/VRM10/Runtime/Migration/Materials/MigrationPbrMaterial.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Linq;
using UniGLTF;
using UniJSON;
using UnityEngine;
@ -53,7 +54,9 @@ namespace UniVRM10
var src = gltf.materials[idx];
var vrm0XMaterial = vrm0XExtension["materialProperties"][idx];
// NOTE: ignore MToon
if (MigrationMaterialUtil.GetShaderName(vrm0XMaterial) != UsingGltfMaterialKeywordInVrmExtension) return;
// NOTE: ignore Unlit
if (glTF_KHR_materials_unlit.IsEnable(src)) return;
if (needMigrationRoughnessTextureValueSquared)
@ -75,10 +78,17 @@ namespace UniVRM10
emissiveFactor *= ex.EmissiveMultiplier.Value;
}
}
// NOTE: 新しい emissive_strength 拡張を書き込むため、拡張をまっさらにする
var extensionsExport = new glTFExtensionExport();
src.extensions = extensionsExport;
var linearEmissiveFactor = emissiveFactor.linear;
// NOTE: glTF 仕様違反だが、内部中間形式であるし、コードの簡単のため emissiveFactor に 1.0 より大きな値を入れる。
if (linearEmissiveFactor.maxColorComponent > 1)
{
var maxColorComponent = linearEmissiveFactor.maxColorComponent;
linearEmissiveFactor /= maxColorComponent;
UniGLTF.glTF_KHR_materials_emissive_strength.Serialize(ref src.extensions, maxColorComponent);
}
src.emissiveFactor = linearEmissiveFactor.ToFloat3(ColorSpace.Linear, ColorSpace.Linear);
}
}

1
Assets/VRM10/Runtime/Migration/MigrationMaterials.cs
View File

@ -40,6 +40,7 @@ namespace UniVRM10
}
// 4. VRM 拡張のうち、MToon 情報からの取得を試みる.
// NOTE: MToon だった場合、内部で material.extensions を破棄してしまう.
MigrationMToonMaterial.Migrate(gltf, vrm0);
}
catch (Exception ex)