Changeset 10216 for code/trunk/src/orxonox/Scene.cc
- Timestamp:
- Jan 31, 2015, 6:03:17 PM (9 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/Scene.cc
r10196 r10216 363 363 SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer()); 364 364 365 // get the CollisionShape pointers 366 const btCollisionShape* cs0 = colObj0->getCollisionShape(); 367 const btCollisionShape* cs1 = colObj1->getCollisionShape(); 368 365 369 // false means that bullet will assume we didn't modify the contact 366 370 bool modified = false; 367 371 if (object0->isCollisionCallbackActive()) 368 modified |= object0->collidesAgainst(object1, c p);372 modified |= object0->collidesAgainst(object1, cs1, cp); 369 373 if (object1->isCollisionCallbackActive()) 370 modified |= object1->collidesAgainst(object0, c p);374 modified |= object1->collidesAgainst(object0, cs0, cp); 371 375 372 376 return modified;
Note: See TracChangeset
for help on using the changeset viewer.