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

SpringBone 末端の仕様変更

Browse Source 
https://github.com/vrm-c/vrm-specification/pull/255
This commit is contained in:
ousttrue 2021-06-01 17:03:56 +09:00
parent b2f342d7e1
commit e3ffffbd6f
2 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneJoint.cs
View File

@ -45,34 +45,5 @@ namespace UniVRM10
#endif
}
}
public void Process(Transform center, float deltaTime, List<SpringBoneLogic.InternalCollider> colliders, VRM10SpringBoneJoint tail)
{
if (m_logic == null)
{
// 初期化
if (tail != null)
{
var localPosition = tail.transform.localPosition;
var scale = tail.transform.lossyScale;
m_logic = new SpringBoneLogic(center, transform,
new Vector3(
localPosition.x * scale.x,
localPosition.y * scale.y,
localPosition.z * scale.z
));
}
else
{
// 親からまっすぐの位置に tail を作成
var delta = transform.position - transform.parent.position;
var childPosition = transform.position + delta.normalized * 0.07f;
m_logic = new SpringBoneLogic(center, transform, transform.worldToLocalMatrix.MultiplyPoint(childPosition));
}
}
m_logic.Update(center, m_stiffnessForce * deltaTime, m_dragForce, m_gravityDir * (m_gravityPower * deltaTime), colliders, m_jointRadius);
}
}
}

27
Assets/VRM10/Runtime/Components/VRM10ControllerSpringBone.cs
View File

@ -89,15 +89,28 @@ namespace UniVRM10
}
}
if (m_logics == null)
{
// udpate joints
VRM10SpringBoneJoint lastJoint = Joints.FirstOrDefault(x => x != null);
foreach (var joint in Joints.Where(x => x != null).Skip(1))
m_logics = Enumerable.Zip(Joints, Joints.Skip(1), (head, tail) =>
{
lastJoint.Process(center, Time.deltaTime, m_colliderList, joint);
lastJoint = joint;
}
lastJoint.Process(center, Time.deltaTime, m_colliderList, null);
var localPosition = tail.transform.localPosition;
var scale = tail.transform.lossyScale;
var logic = new SpringBoneLogic(center, head.transform,
new Vector3(
localPosition.x * scale.x,
localPosition.y * scale.y,
localPosition.z * scale.z
));
return (head, logic);
}).ToList();
}
foreach (var (head, logic) in m_logics)
{
logic.Update(center,
head.m_stiffnessForce * Time.deltaTime,
head.m_dragForce,
head.m_gravityDir * (head.m_gravityPower * Time.deltaTime),
m_colliderList, head.m_jointRadius);
}
}
}