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

Merge pull request #2585 from ousttrue/fix/vrm10viewer_builtin

Browse Source 
[URP] fix Vrm10Viewer when RenderPipeLine is built-in.
This commit is contained in:
ousttrue 2025-02-17 15:16:59 +09:00 committed by GitHub
commit e2464cd4d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@ -499,8 +499,14 @@ namespace UniVRM10.VRM10Viewer
private void Start()
{
m_mtoonImporter = new(m_mtoonMaterialOpaque, m_mtoonMaterialAlphaBlend);
m_pbrImporter = new(m_pbrOpaqueMaterial, m_pbrAlphaBlendMaterial);
if (m_mtoonMaterialOpaque != null && m_mtoonMaterialAlphaBlend != null)
{
m_mtoonImporter = new(m_mtoonMaterialOpaque, m_mtoonMaterialAlphaBlend);
}
if (m_pbrOpaqueMaterial != null && m_pbrAlphaBlendMaterial != null)
{
m_pbrImporter = new(m_pbrOpaqueMaterial, m_pbrAlphaBlendMaterial);
}
m_autoEmotion = gameObject.AddComponent<VRM10AutoExpression>();
m_autoBlink = gameObject.AddComponent<VRM10Blinker>();
@ -520,7 +526,10 @@ namespace UniVRM10.VRM10Viewer
Motion = BvhMotion.LoadBvhFromText(m_motion.text);
if (m_useCustomMaterial.isOn)
{
Motion.SetBoxManMaterial(Instantiate(m_pbrOpaqueMaterial));
if (m_pbrAlphaBlendMaterial != null)
{
Motion.SetBoxManMaterial(Instantiate(m_pbrOpaqueMaterial));
}
}
}
@ -792,7 +801,7 @@ namespace UniVRM10.VRM10Viewer
IMaterialDescriptorGenerator GetMaterialDescriptorGenerator()
{
if (m_useCustomMaterial.isOn)
if (m_useCustomMaterial.isOn && (m_mtoonImporter != null || m_pbrImporter != null))
{
return new OrderedMaterialDescriptorGenerator(m_mtoonImporter, m_unlitImporter, m_pbrImporter);
}