From 7d3aa056ceb6ac44ebe1a75b14767ddc325509ab Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 11 Jul 2024 15:11:34 +0900 Subject: [PATCH] =?UTF-8?q?collider=20=E3=81=AE=E3=82=AB=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=83=A0=E3=82=A8=E3=83=87=E3=82=A3=E3=82=BF=E3=83=BC=E3=81=A7?= =?UTF-8?q?=E7=84=A1=E5=8A=B9=E3=81=AA=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VRM10SpringBoneColliderEditor.cs | 32 ++++++++++++++++--- .../SpringBone/VRM10SpringBoneCollider.cs | 2 +- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderEditor.cs b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderEditor.cs index c4b0ff4df..7680d87de 100644 --- a/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderEditor.cs +++ b/Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderEditor.cs @@ -14,10 +14,34 @@ namespace UniVRM10 Repaint(); } var property = serializedObject.FindProperty("m_Script"); - var script = (VRM10SpringBoneCollider)target; - EditorGUILayout.PropertyField(property, new GUIContent("Script (" + script.GetIdentificationName() + ")")); - DrawPropertiesExcluding(serializedObject, "m_Script"); + var component = (VRM10SpringBoneCollider)target; + EditorGUILayout.PropertyField(property, new GUIContent("Script (" + component.GetIdentificationName() + ")")); + switch (component.ColliderType) + { + case VRM10SpringBoneColliderTypes.Plane: + // radius: x + // tail: x + // normal: o + DrawPropertiesExcluding(serializedObject, "m_Script", nameof(component.Tail), nameof(component.Radius)); + break; + + case VRM10SpringBoneColliderTypes.Sphere: + case VRM10SpringBoneColliderTypes.SphereInside: + // radius: o + // tail: x + // normal: x + DrawPropertiesExcluding(serializedObject, nameof(component.Tail), nameof(component.Normal), "m_Script"); + break; + + case VRM10SpringBoneColliderTypes.Capsule: + case VRM10SpringBoneColliderTypes.CapsuleInside: + // radius: o + // tail: o + // normal: x + DrawPropertiesExcluding(serializedObject, nameof(component.Normal), "m_Script"); + break; + } serializedObject.ApplyModifiedProperties(); } } -} +} \ No newline at end of file diff --git a/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs index 67518100e..9a0df19af 100644 --- a/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs +++ b/Assets/VRM10/Runtime/Components/SpringBone/VRM10SpringBoneCollider.cs @@ -51,7 +51,7 @@ namespace UniVRM10 case VRM10SpringBoneColliderTypes.Plane: Gizmos.color = Color.magenta; - DrawPlane(transform.localToWorldMatrix, Offset, Normal, Radius); + DrawPlane(transform.localToWorldMatrix, Offset, Normal, 0.05f); break; case VRM10SpringBoneColliderTypes.SphereInside: