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

Merge pull request #2220 from tsgcpp/feature/register_collidergroups_even_if_no_colliders

Browse Source 
ColliderGroupsはあるがColliderが全く存在しない場合にVRM0.xの読み込みで発生するエラーを解消する
This commit is contained in:
ousttrue
2024-01-16 20:31:10 +09:00
committed by GitHub
parent d6ba5c5376 11405063d8
commit d36a7073f3
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@@ -539,7 +539,11 @@ namespace UniVRM10
throw new Vrm10Exception("unknown shape");
}
}
}
// colliderGroup
if (gltfVrmSpringBone.ColliderGroups != null)
{
var secondary = Root.transform.Find("secondary");
if (secondary == null)
{
@@ -547,21 +551,23 @@ namespace UniVRM10
secondary.SetParent(Root.transform, false);
}
// colliderGroup
if (gltfVrmSpringBone.ColliderGroups != null)
foreach (var g in gltfVrmSpringBone.ColliderGroups)
{
foreach (var g in gltfVrmSpringBone.ColliderGroups)
{
var colliderGroup = secondary.gameObject.AddComponent<VRM10SpringBoneColliderGroup>();
controller.SpringBone.ColliderGroups.Add(colliderGroup);
var colliderGroup = secondary.gameObject.AddComponent<VRM10SpringBoneColliderGroup>();
controller.SpringBone.ColliderGroups.Add(colliderGroup);
if (g != null && g.Colliders != null)
if (g != null && g.Colliders != null)
{
foreach (var c in g.Colliders)
{
foreach (var c in g.Colliders)
if (c < 0 || c >= colliders.Count)
{
var collider = colliders[c];
colliderGroup.Colliders.Add(collider);
// 不正なindexの場合は無視する
continue;
}
var collider = colliders[c];
colliderGroup.Colliders.Add(collider);
}
}
}