From b16ea01edead8e23cfefdeb415322fd603a6a78b Mon Sep 17 00:00:00 2001 From: ousttrue Date: Fri, 29 Nov 2024 16:07:50 +0900 Subject: [PATCH] max delta --- .../ClothWarp/Runtime/Jobs/Collision.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Assets/VRM10_Samples/ClothSample/ClothWarp/Runtime/Jobs/Collision.cs b/Assets/VRM10_Samples/ClothSample/ClothWarp/Runtime/Jobs/Collision.cs index 71966a434..ab5c6ec2a 100644 --- a/Assets/VRM10_Samples/ClothSample/ClothWarp/Runtime/Jobs/Collision.cs +++ b/Assets/VRM10_Samples/ClothSample/ClothWarp/Runtime/Jobs/Collision.cs @@ -148,8 +148,18 @@ namespace UniVRM10.ClothWarp.Jobs private void CollisionMove(int particleIndex, Vector3 delta) { +#if false + // 足して割る CollisionCount[particleIndex] += 1; CollisionDelta[particleIndex] += delta; +#else + // 深いのに1回当てる + if (CollisionDelta[particleIndex].sqrMagnitude < delta.sqrMagnitude) + { + CollisionCount[particleIndex] = 1; + CollisionDelta[particleIndex] = delta; + } +#endif } public void Execute(int rectIndex) @@ -312,8 +322,8 @@ namespace UniVRM10.ClothWarp.Jobs } else { - NextPosition[particleIndex] = StrandCollision[particleIndex]; - } + NextPosition[particleIndex] = StrandCollision[particleIndex]; } } + } } \ No newline at end of file