diff --git a/Assets/VRM/Runtime/FastSpringBone/Blittables/BlittablePoint.cs b/Assets/VRM/Runtime/FastSpringBone/Blittables/BlittablePoint.cs index f508200c8..c2de1eace 100644 --- a/Assets/VRM/Runtime/FastSpringBone/Blittables/BlittablePoint.cs +++ b/Assets/VRM/Runtime/FastSpringBone/Blittables/BlittablePoint.cs @@ -116,9 +116,9 @@ namespace VRM.FastSpringBones.Blittables var collider = colliderGroup.Colliders[j]; var colliderPosition = colliderGroup.Transform->TransformPoint(collider.Offset); var r = _radius + collider.Radius; - + if (!((nextPosition - colliderPosition).sqrMagnitude <= (r * r))) continue; - + // ヒット。Colliderの半径方向に押し出す var normal = (nextPosition - colliderPosition).normalized; var posFromCollider = colliderPosition + normal * (_radius + collider.Radius); @@ -131,7 +131,7 @@ namespace VRM.FastSpringBones.Blittables } private static Quaternion FromToRotation(Vector3 from, Vector3 to) - => Quaternion.AxisAngle( + => Quaternion.AngleAxis( angle: Mathf.Acos(Mathf.Clamp(Vector3.Dot(from.normalized, to.normalized), -1f, 1f)), axis: Vector3.Cross(from, to).normalized ); @@ -139,7 +139,7 @@ namespace VRM.FastSpringBones.Blittables private Quaternion ApplyRotation(Vector3 nextTail) { var rotation = _transform->ParentWorldRotation * _localRotation; - return + return FromToRotation( rotation * _boneAxis, nextTail - _transform->WorldPosition) * diff --git a/Assets/VRM/Samples/SpringBone.meta b/Assets/VRM/Samples/SpringBone.meta deleted file mode 100644 index 77a337faa..000000000 --- a/Assets/VRM/Samples/SpringBone.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fc3f1af567d73f41a5172249769f047 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: