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

Radius

Browse Source
This commit is contained in:
ousttrue 2021-05-10 13:46:41 +09:00
parent 6ce78db7ce
commit 56bf73ff01
5 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM/Runtime/SkinnedMeshUtility/VRMBoneNormalizer.cs
View File

@ -152,7 +152,7 @@ namespace VRM
dstColliderGroup.Colliders = src.Colliders.Select(y =>
{
var offset = dst.worldToLocalMatrix.MultiplyPoint(src.transform.localToWorldMatrix.MultiplyPoint(y.Offset));
var ls = src.UniformedLossyScale;
var ls = src.transform.UniformedLossyScale();
return new VRMSpringBoneColliderGroup.SphereCollider
{
Offset = offset,

16
Assets/VRM/Runtime/SpringBone/TransformExtensions.cs Normal file
View File

@ -0,0 +1,16 @@
using UnityEngine;
namespace VRM
{
public static class TransformExtensions
{
public static float UniformedLossyScale(this Transform transform)
{
return Mathf.Max(
Mathf.Max(transform.lossyScale.x,
transform.lossyScale.y),
transform.lossyScale.z
);
}
}
}

11
Assets/VRM/Runtime/SpringBone/TransformExtensions.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d5465187646dee944ac1bc45ddf0fc7a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

23
Assets/VRM/Runtime/SpringBone/VRMSpringBone.cs
View File

@ -85,7 +85,11 @@ namespace VRM
private Quaternion LocalRotation { get; }
public float Radius { get; set; }
float m_radius;
public void SetRadius(float radius)
{
m_radius = radius * m_transform.UniformedLossyScale();
}
private Quaternion ParentRotation =>
m_transform.parent != null
@ -139,12 +143,12 @@ namespace VRM
{
foreach (var collider in colliders)
{
var r = Radius + collider.Radius;
var r = m_radius + collider.Radius;
if (Vector3.SqrMagnitude(nextTail - collider.Position) <= (r * r))
{
// ヒット。Colliderの半径方向に押し出す
var normal = (nextTail - collider.Position).normalized;
var posFromCollider = collider.Position + normal * (Radius + collider.Radius);
var posFromCollider = collider.Position + normal * (m_radius + collider.Radius);
// 長さをboneLengthに強制
nextTail = m_transform.position + (posFromCollider - m_transform.position).normalized * m_length;
}
@ -152,7 +156,7 @@ namespace VRM
return nextTail;
}
public void DrawGizmo(Transform center, float radius, Color color)
public void DrawGizmo(Transform center, Color color)
{
var currentTail = center != null
? center.TransformPoint(m_currentTail)
@ -163,13 +167,14 @@ namespace VRM
Gizmos.color = Color.gray;
Gizmos.DrawLine(currentTail, prevTail);
Gizmos.DrawWireSphere(prevTail, radius);
Gizmos.DrawWireSphere(prevTail, m_radius);
Gizmos.color = color;
Gizmos.DrawLine(currentTail, m_transform.position);
Gizmos.DrawWireSphere(currentTail, radius);
Gizmos.DrawWireSphere(currentTail, m_radius);
}
}
List<VRMSpringBoneLogic> m_verlet = new List<VRMSpringBoneLogic>();
void Awake()
@ -302,7 +307,7 @@ namespace VRM
foreach (var verlet in m_verlet)
{
verlet.Radius = m_hitRadius;
verlet.SetRadius(m_hitRadius);
verlet.Update(m_center,
stiffness,
m_dragForce,
@ -317,7 +322,9 @@ namespace VRM
if (!m_drawGizmo) return;
foreach (var verlet in m_verlet)
verlet.DrawGizmo(m_center, m_hitRadius, m_gizmoColor);
{
verlet.DrawGizmo(m_center, m_gizmoColor);
}
}
}
}

14
Assets/VRM/Runtime/SpringBone/VRMSpringBoneColliderGroup.cs
View File

@ -31,23 +31,11 @@ namespace VRM
[SerializeField]
Color m_gizmoColor = Color.magenta;
public float UniformedLossyScale
{
get
{
return Mathf.Max(
Mathf.Max(transform.lossyScale.x,
transform.lossyScale.y),
transform.lossyScale.z
);
}
}
private void OnDrawGizmosSelected()
{
Gizmos.color = m_gizmoColor;
Matrix4x4 mat = transform.localToWorldMatrix;
var ls = UniformedLossyScale;
var ls = transform.UniformedLossyScale();
Gizmos.matrix = mat * Matrix4x4.Scale(new Vector3(
1.0f / transform.lossyScale.x * ls,
1.0f / transform.lossyScale.y * ls,