From b2c3d149420c5d652ca6fd25c76e0274135e06e8 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 20 Oct 2022 16:58:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A6=AA=E6=8C=87=E3=81=AE=E3=82=AC?= =?UTF-8?q?=E3=82=A4=E3=83=89=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/VRM10/Editor/Vrm10InstanceEditor.cs | 49 +++++++++++++++++++ .../Components/Vrm10Instance/Vrm10Instance.cs | 2 + 2 files changed, 51 insertions(+) diff --git a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs index 878bbf029..b01285417 100644 --- a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs +++ b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs @@ -169,5 +169,54 @@ namespace UniVRM10 base.OnInspectorGUI(); } + + public void OnSceneGUI() + { + // 親指のガイド + DrawThumbGuide(target as Vrm10Instance); + } + + static void DrawThumbGuide(Vrm10Instance instance) + { + if (instance == null) + { + return; + } + if (instance.TryGetBoneTransform(HumanBodyBones.LeftThumbProximal, out var l0)) + { + if (instance.TryGetBoneTransform(HumanBodyBones.LeftThumbIntermediate, out var l1)) + { + if (instance.TryGetBoneTransform(HumanBodyBones.LeftThumbDistal, out var l2)) + { + var color = new Color(1.0f, 0.5f, 0.5f, 0.8f); + DrawThumbGuide(Vector3.up, color, l0, l1, l2); + } + } + } + if (instance.TryGetBoneTransform(HumanBodyBones.RightThumbProximal, out var r0)) + { + if (instance.TryGetBoneTransform(HumanBodyBones.RightThumbIntermediate, out var r1)) + { + if (instance.TryGetBoneTransform(HumanBodyBones.RightThumbDistal, out var r2)) + { + var color = new Color(0.5f, 0.5f, 1.0f, 0.8f); + DrawThumbGuide(Vector3.down, color, r0, r1, r2); + } + } + } + } + static void DrawThumbGuide(Vector3 up, Color color, Transform t0, Transform t1, Transform t2) + { + Handles.color = color; + Handles.matrix = Matrix4x4.identity; + var len = (t0.position - t1.position).magnitude; + var dir0 = (t0.position - t1.position).normalized; + var dir2 = (t2.position - t1.position).normalized; + var angle = Mathf.Acos(Vector3.Dot(dir0, dir2)) * Mathf.Rad2Deg; + Handles.DrawSolidArc(t1.position, up, dir0, angle, len); + Handles.color = Color.green; + Handles.DrawLine(t1.position, t1.position + Vector3.up * len); + Handles.Label(t1.position, "thumb guide"); + } } } diff --git a/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs b/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs index f2a0b1028..d1397552e 100644 --- a/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs +++ b/Assets/VRM10/Runtime/Components/Vrm10Instance/Vrm10Instance.cs @@ -148,5 +148,7 @@ namespace UniVRM10 } return true; } + + } } From 7a93206a945fcb5c43f5dee3406f409d4726ec52 Mon Sep 17 00:00:00 2001 From: 0b5vr <0b5vr@0b5vr.com> Date: Mon, 24 Oct 2022 18:24:54 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feature:=20=E8=A6=AA=E6=8C=87=E3=81=AE?= =?UTF-8?q?=E5=90=91=E3=81=8D=E3=83=BB=E7=88=AA=E3=81=AE=E5=90=91=E3=81=8D?= =?UTF-8?q?=E3=81=AE=E3=82=AE=E3=82=BA=E3=83=A2=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ousttrueさんによる元コミット: b2c3d149420c5d652ca6fd25c76e0274135e06e8 --- Assets/VRM10/Editor/Vrm10InstanceEditor.cs | 66 +++++++++++++++++----- 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs index b01285417..8a57829f4 100644 --- a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs +++ b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs @@ -188,8 +188,10 @@ namespace UniVRM10 { if (instance.TryGetBoneTransform(HumanBodyBones.LeftThumbDistal, out var l2)) { - var color = new Color(1.0f, 0.5f, 0.5f, 0.8f); - DrawThumbGuide(Vector3.up, color, l0, l1, l2); + var color = new Color(0.5f, 1.0f, 0.0f, 1.0f); + var thumbDir = (Vector3.forward + Vector3.left).normalized; + var nailNormal = (Vector3.forward + Vector3.right).normalized; + DrawThumbGuide(l0.position, l2.position, thumbDir, nailNormal, color); } } } @@ -199,24 +201,62 @@ namespace UniVRM10 { if (instance.TryGetBoneTransform(HumanBodyBones.RightThumbDistal, out var r2)) { - var color = new Color(0.5f, 0.5f, 1.0f, 0.8f); - DrawThumbGuide(Vector3.down, color, r0, r1, r2); + var color = new Color(0.5f, 1.0f, 0.0f, 1.0f); + var thumbDir = (Vector3.forward + Vector3.right).normalized; + var nailNormal = (Vector3.forward + Vector3.left).normalized; + DrawThumbGuide(r0.position, r2.position, thumbDir, nailNormal, color); } } } } - static void DrawThumbGuide(Vector3 up, Color color, Transform t0, Transform t1, Transform t2) + static void DrawThumbGuide(Vector3 metacarpalPos, Vector3 distalPos, Vector3 thumbDir, Vector3 nailNormal, Color color) { Handles.color = color; Handles.matrix = Matrix4x4.identity; - var len = (t0.position - t1.position).magnitude; - var dir0 = (t0.position - t1.position).normalized; - var dir2 = (t2.position - t1.position).normalized; - var angle = Mathf.Acos(Vector3.Dot(dir0, dir2)) * Mathf.Rad2Deg; - Handles.DrawSolidArc(t1.position, up, dir0, angle, len); - Handles.color = Color.green; - Handles.DrawLine(t1.position, t1.position + Vector3.up * len); - Handles.Label(t1.position, "thumb guide"); + + var thumbVector = distalPos - metacarpalPos; + var thumbLength = thumbVector.magnitude * 1.5f; + var thickness = thumbLength * 0.1f; + var tipCenter = metacarpalPos + thumbDir * (thumbLength - thickness); + var crossVector = Vector3.Cross(thumbDir, nailNormal); + + // 指の形を描く + Handles.DrawLine(metacarpalPos + crossVector * thickness, tipCenter + crossVector * thickness); + Handles.DrawLine(metacarpalPos - crossVector * thickness, tipCenter - crossVector * thickness); + Handles.DrawWireArc(tipCenter, nailNormal, crossVector, 180f, thickness); + + Handles.DrawLine(metacarpalPos + nailNormal * thickness, tipCenter + nailNormal * thickness); + Handles.DrawLine(metacarpalPos - nailNormal * thickness, tipCenter - nailNormal * thickness); + Handles.DrawWireArc(tipCenter, crossVector, -nailNormal, 180f, thickness); + + Handles.DrawWireDisc(metacarpalPos, thumbDir, thickness); + Handles.DrawWireDisc(tipCenter, thumbDir, thickness); + + // 爪の方向に伸びる線を描く + Handles.DrawDottedLine(tipCenter, tipCenter + nailNormal * thickness * 8.0f, 1.0f); + + // 爪を描く + Vector2[] points2 = { + new Vector2(-0.2f, -0.5f), + new Vector2(0.2f, -0.5f), + new Vector2(0.5f, -0.3f), + new Vector2(0.5f, 0.3f), + new Vector2(0.2f, 0.5f), + new Vector2(-0.2f, 0.5f), + new Vector2(-0.5f, 0.3f), + new Vector2(-0.5f, -0.3f), + new Vector2(-0.2f, -0.5f), + }; + Vector3[] points = points2 + .Select(v => tipCenter + (nailNormal + crossVector * v.x + thumbDir * v.y) * thickness) + .ToArray(); + + Handles.DrawAAPolyLine(points); + Handles.color = color * new Color(1.0f, 1.0f, 1.0f, 0.1f); + Handles.DrawAAConvexPolygon(points); + + // 文字ラベルを描く + Handles.Label(tipCenter + nailNormal * thickness * 6.0f, "Thumb nail direction"); } } }