mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue in collision detection

Browse Source
This commit is contained in:
Daniel Chappuis 2017-01-27 20:26:56 +01:00
parent de07fcf45b
commit bccdfa9b58
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/collision/CollisionDetection.cpp
View File

@ -605,7 +605,7 @@ NarrowPhaseInfo* CollisionDetection::computeMiddlePhaseForProxyShapes(ProxyShape
computeConvexVsConcaveMiddlePhase(&pair, mMemoryAllocator, &narrowPhaseInfo); computeConvexVsConcaveMiddlePhase(&pair, mMemoryAllocator, &narrowPhaseInfo);
} }
return nullptr; return narrowPhaseInfo;
} }
// Report all the bodies that overlap with the aabb in parameter // Report all the bodies that overlap with the aabb in parameter
@ -976,7 +976,7 @@ void CollisionDetection::testCollision(CollisionCallback* callback) {
// For each possible collision pair of bodies // For each possible collision pair of bodies
map<overlappingpairid, OverlappingPair*>::iterator it; map<overlappingpairid, OverlappingPair*>::iterator it;
for (it = mOverlappingPairs.begin(); it != mOverlappingPairs.end(); ) { for (it = mOverlappingPairs.begin(); it != mOverlappingPairs.end(); ++it) {
OverlappingPair* pair = it->second; OverlappingPair* pair = it->second;