From 4f2ad3a3ad225ae00e32b209754f074c0a203213 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Fri, 18 Dec 2009 01:20:57 +0000 Subject: [PATCH] applied patch for compound shape in SpuGatheringCollisionTask, see Issue 313 http://code.google.com/p/bullet/issues/detail?id=313 Thanks Bbilz for the report and fix! --- .../SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp index 754fd5d90..49cff5a3f 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp @@ -1163,7 +1163,9 @@ void processCollisionTask(void* userPtr, void* lsMemPtr) #endif //USE_SEPDISTANCE_UTIL ) { - handleCollisionPair(collisionPairInput, lsMem, spuContacts, (ppu_address_t)lsMem.getColObj0()->getCollisionShape(), &lsMem.gCollisionShapes[0].collisionShape, (ppu_address_t)lsMem.getColObj1()->getCollisionShape(), &lsMem.gCollisionShapes[1].collisionShape); + handleCollisionPair(collisionPairInput, lsMem, spuContacts, + (ppu_address_t)lsMem.getColObj0()->getRootCollisionShape(), &lsMem.gCollisionShapes[0].collisionShape, + (ppu_address_t)lsMem.getColObj1()->getRootCollisionShape(), &lsMem.gCollisionShapes[1].collisionShape); } else { //spu_printf("boxbox dist = %f\n",distance);