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

Merge pull request #926 from ousttrue/feature10/VRM10SpringBoneColliderGroup_null_check

Browse Source 
VRM10SpringBoneColliderGroup の null 防御
This commit is contained in:
PoChang007 2021-05-06 13:47:56 +09:00 committed by GitHub
commit 3bae81d3d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs
View File

@ -64,7 +64,7 @@ namespace UniVRM10
Undo.RecordObject(target, "Sort Colliders by Radius");
target.Colliders = target.Colliders.OrderBy(x => -x.Radius).ToList();
target.Colliders = target.Colliders.OrderBy(x => -x.Radius);
}
[MenuItem("CONTEXT/VRM10SpringBoneColliderGroup/Sort Colliders by Offset Y")]
@ -75,7 +75,7 @@ namespace UniVRM10
Undo.RecordObject(target, "Sort Colliders by Offset Y");
target.Colliders = target.Colliders.OrderBy(x => -x.Offset.y).ToList();
target.Colliders = target.Colliders.OrderBy(x => -x.Offset.y);
}
}
}

43
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBone.cs
View File

@ -58,34 +58,31 @@ namespace UniVRM10
m_colliderList.Clear();
if (ColliderGroups != null)
{
foreach (var group in ColliderGroups)
foreach (var group in ColliderGroups.Where(x => x != null))
{
if (group != null)
foreach (var collider in group.Colliders)
{
foreach (var collider in group.Colliders)
switch (collider.ColliderType)
{
switch (collider.ColliderType)
{
case VRM10SpringBoneColliderTypes.Sphere:
m_colliderList.Add(new SpringBoneLogic.InternalCollider
{
ColliderTypes = VRM10SpringBoneColliderTypes.Sphere,
WorldPosition = group.transform.TransformPoint(collider.Offset),
Radius = collider.Radius,
case VRM10SpringBoneColliderTypes.Sphere:
m_colliderList.Add(new SpringBoneLogic.InternalCollider
{
ColliderTypes = VRM10SpringBoneColliderTypes.Sphere,
WorldPosition = group.transform.TransformPoint(collider.Offset),
Radius = collider.Radius,
});
break;
});
break;
case VRM10SpringBoneColliderTypes.Capsule:
m_colliderList.Add(new SpringBoneLogic.InternalCollider
{
ColliderTypes = VRM10SpringBoneColliderTypes.Capsule,
WorldPosition = group.transform.TransformPoint(collider.Offset),
Radius = collider.Radius,
WorldTail = group.transform.TransformPoint(collider.Tail)
});
break;
}
case VRM10SpringBoneColliderTypes.Capsule:
m_colliderList.Add(new SpringBoneLogic.InternalCollider
{
ColliderTypes = VRM10SpringBoneColliderTypes.Capsule,
WorldPosition = group.transform.TransformPoint(collider.Offset),
Radius = collider.Radius,
WorldTail = group.transform.TransformPoint(collider.Tail)
});
break;
}
}
}

40
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneColliderGroup.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
@ -11,6 +12,43 @@ namespace UniVRM10
public class VRM10SpringBoneColliderGroup : MonoBehaviour
{
[SerializeField]
public List<VRM10SpringBoneCollider> Colliders = new List<VRM10SpringBoneCollider>();
List<VRM10SpringBoneCollider> m_colliders = new List<VRM10SpringBoneCollider>();
public IEnumerable<VRM10SpringBoneCollider> Colliders
{
get
{
return m_colliders.Where(x => x != null);
}
set
{
m_colliders = value.ToList();
OnValidate();
}
}
public void AddCollider(VRM10SpringBoneCollider collider)
{
if (collider == null)
{
Debug.LogWarning("null collider");
return;
}
if (m_colliders == null)
{
m_colliders = new List<VRM10SpringBoneCollider>();
}
m_colliders.Add(collider);
}
void OnValidate()
{
if (m_colliders.Any(x => x == null))
{
Debug.LogWarning($"{this} remove null");
m_colliders = m_colliders.Where(x => x != null).ToList();
}
}
}
}

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

@ -384,7 +384,7 @@ namespace UniVRM10
var node = Nodes[c.Node.Value];
var collider = node.gameObject.AddComponent<VRM10SpringBoneCollider>();
colliderGroup.Colliders.Add(collider);
colliderGroup.AddCollider(collider);
if (c.Shape.Sphere is UniGLTF.Extensions.VRMC_springBone.ColliderShapeSphere sphere)
{