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

exclude checkbox

Browse Source
This commit is contained in:
ousttrue
2021-01-22 15:55:55 +09:00
parent a61c3f92df
commit 9b45fb9f72
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringJoint.cs
View File

@@ -27,8 +27,11 @@ namespace UniVRM10
[SerializeField, Range(0, 1)]
public float m_dragForce = 0.4f;
[SerializeField]
public bool m_exclude;
[SerializeField, Range(0, 0.5f), Header("Collision")]
public float m_hitRadius = 0.02f;
public float m_jointRadius = 0.02f;
SpringBoneLogic m_logic;
@@ -36,7 +39,7 @@ namespace UniVRM10
{
if (m_logic != null)
{
m_logic.DrawGizmo(center, m_hitRadius, color);
m_logic.DrawGizmo(center, m_jointRadius, color);
}
else
{
@@ -69,7 +72,7 @@ namespace UniVRM10
}
}
m_logic.Update(center, m_stiffnessForce * deltaTime, m_dragForce, m_gravityDir * (m_gravityPower * deltaTime), colliders, m_hitRadius);
m_logic.Update(center, m_stiffnessForce * deltaTime, m_dragForce, m_gravityDir * (m_gravityPower * deltaTime), colliders, m_jointRadius);
}
}
}

1
Assets/VRM10/Runtime/IO/Vrm10Storage.cs
View File

@@ -728,6 +728,7 @@ namespace UniVRM10
joint.GravityDir = gltfJoint.GravityDir.ToVector3();
joint.GravityPower = gltfJoint.GravityPower.Value;
joint.Stiffness = gltfJoint.Stiffness.Value;
joint.Exclude = gltfJoint.Exclude.Value;
springBone.Joints.Add(joint);
}

3
Assets/VRM10/Runtime/UnityBuilder/ComponentBuilder.cs
View File

@@ -307,7 +307,8 @@ namespace UniVRM10
joint.m_gravityPower = vrmJoint.GravityPower;
joint.m_gravityDir = vrmJoint.GravityDir.ToUnityVector3();
joint.m_dragForce = vrmJoint.DragForce;
joint.m_hitRadius = vrmJoint.HitRadius;
joint.m_jointRadius = vrmJoint.HitRadius;
joint.m_exclude = vrmJoint.Exclude;
springBone.Joints.Add(joint);
}

3
Assets/VRM10/Runtime/VRMConverter/RuntimeVrmConverter.cs
View File

@@ -362,7 +362,8 @@ namespace UniVRM10
GravityPower = joint.m_gravityPower,
GravityDir = joint.m_gravityDir.ToNumericsVector3(),
DragForce = joint.m_dragForce,
HitRadius = joint.m_hitRadius,
HitRadius = joint.m_jointRadius,
Exclude = joint.m_exclude,
});
}

2
Assets/VRM10/vrmlib/Runtime/Vrm/SpringBoneManager.cs
View File

@@ -67,6 +67,8 @@ namespace VrmLib
public float HitRadius;
public float Stiffness;
public bool Exclude;
}
public class SpringBone