Capsuleの当たり判定を修正 #2291

vrm-c · May 14, 2024 · 5fd1e5a · 5fd1e5a
1 parent 326bab7
commit 5fd1e5a
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs b/Assets/VRM10/Runtime/FastSpringBone/System/UpdateFastSpringBoneJob.cs
@@ -156,20 +156,29 @@ private static Quaternion Normalize(Quaternion q)
             BlittableLogic logic,
             ref Vector3 nextTail)
         {
-            var P = (worldTail - worldPosition).normalized;
+            var direction = worldTail - worldPosition;
+            if (direction.sqrMagnitude == 0)
+            {
+                // head側半球の球判定
+                ResolveSphereCollision(joint, collider, worldPosition, headTransform, maxColliderScale, logic, ref nextTail);
+                return;
+            }
+            var P = direction.normalized;
             var Q = headTransform.position - worldPosition;
             var dot = Vector3.Dot(P, Q);
             if (dot <= 0)
             {
                 // head側半球の球判定
                 ResolveSphereCollision(joint, collider, worldPosition, headTransform, maxColliderScale, logic, ref nextTail);
+                return;
             }
 
-            var t = dot / P.magnitude;
-            if (t >= 1.0f)
+            var t = dot;
+            if (t >= direction.magnitude)
             {
                 // tail側半球の球判定
                 ResolveSphereCollision(joint, collider, worldTail, headTransform, maxColliderScale, logic, ref nextTail);
+                return;
             }
 
             // head-tail上の m_transform.position との最近点