Skip to content

Commit a303610

Browse files
Fix issue done during Capsule vs Capsule collision refactoring
1 parent 2c1658a commit a303610

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
- Issue [#377](https://github.com/DanielChappuis/reactphysics3d/issues/377) Assert when destroying an empty PhysicsWorld
88
- Issue [#378](https://github.com/DanielChappuis/reactphysics3d/issues/378) Wrong raycasting result against the HeightFieldShape
99
- Issue [#387](https://github.com/DanielChappuis/reactphysics3d/issues/387) Fix memory allocation issue when destroying a ConvexMesh
10+
- Issue [#381](https://github.com/DanielChappuis/reactphysics3d/issues/381) Fix robustness issue with CapsuleShape vs CapsuleShape collision
1011
- Fix crash within testbed application in raycasting scene
11-
- Fix robustness issue with CapsuleShape vs CapsuleShape collision
1212

1313
## [0.10.0] - 2024-03-10
1414

src/collision/narrowphase/CapsuleVsCapsuleAlgorithm.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@ bool CapsuleVsCapsuleAlgorithm::testCollision(NarrowPhaseInfoBatch& narrowPhaseI
197197

198198
// Create the contact info object
199199
narrowPhaseInfoBatch.addContactPoint(batchIndex, normalWorld, penetrationDepth, contactPointCapsule1Local, contactPointCapsule2Local);
200-
201-
narrowPhaseInfoBatch.narrowPhaseInfos[batchIndex].isColliding = true;
202-
isCollisionFound = true;
203200
}
204201
}
205202
else if (sumRadius > 0){ // The segment are overlapping (degenerate case)
@@ -239,11 +236,11 @@ bool CapsuleVsCapsuleAlgorithm::testCollision(NarrowPhaseInfoBatch& narrowPhaseI
239236
// Create the contact info object
240237
narrowPhaseInfoBatch.addContactPoint(batchIndex, normalWorld, sumRadius, contactPointCapsule1Local, contactPointCapsule2Local);
241238
}
242-
243-
narrowPhaseInfoBatch.narrowPhaseInfos[batchIndex].isColliding = true;
244-
isCollisionFound = true;
245239
}
246240
}
241+
242+
narrowPhaseInfoBatch.narrowPhaseInfos[batchIndex].isColliding = true;
243+
isCollisionFound = true;
247244
}
248245
}
249246

0 commit comments

Comments
 (0)