Skip to content

Commit

Permalink
Merge branch 'master' into fix/springbone0x_runtime_interface
Browse files Browse the repository at this point in the history
  • Loading branch information
ousttrue authored Oct 8, 2024
2 parents 583c02a + b45b514 commit 60a226a
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,24 @@ internal Vrm10Runtime MakeRuntime(bool useControlRig)
{
if (m_springBoneRuntime == null)
{
// シーン配置モデルが play された
var provider = GetComponent<IVrm10SpringBoneRuntimeProvider>();
if (provider != null)
{
// 明示的カスタマイズ
m_springBoneRuntime = provider.CreateSpringBoneRuntime();
}
else
{
// deafult に fallback
m_springBoneRuntime = new Vrm10FastSpringboneRuntime();
if (Application.isEditor)
{
m_springBoneRuntime = new Vrm10FastSpringboneRuntimeStandalone();
}
else
{
m_springBoneRuntime = new Vrm10FastSpringboneRuntime();
}
}
m_springBoneRuntime.InitializeAsync(this, new ImmediateCaller());
}
Expand Down

0 comments on commit 60a226a

Please sign in to comment.