diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-08 08:17:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 08:17:41 +0100 |
| commit | 706431b06156f9bb83ef71bd99262b68eea43594 (patch) | |
| tree | 150ffb07b395c3d0e3fd9618a8612e52dabec8b1 | |
| parent | d4b19d8d830342bcb1812082ac623d81fa8305bc (diff) | |
| parent | 5f110c5b980b50a57a47e8aeb5bab7a33560100c (diff) | |
Merge pull request #12724 from AndreaCatania/bullet
Bullet: Fix collision exceptions
| -rw-r--r-- | modules/bullet/collision_object_bullet.cpp | 4 | ||||
| -rw-r--r-- | modules/bullet/space_bullet.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp index 5739568d91..769e2c943e 100644 --- a/modules/bullet/collision_object_bullet.cpp +++ b/modules/bullet/collision_object_bullet.cpp @@ -93,11 +93,15 @@ void CollisionObjectBullet::setupBulletCollisionObject(btCollisionObject *p_coll void CollisionObjectBullet::add_collision_exception(const CollisionObjectBullet *p_ignoreCollisionObject) { exceptions.insert(p_ignoreCollisionObject->get_self()); bt_collision_object->setIgnoreCollisionCheck(p_ignoreCollisionObject->bt_collision_object, true); + if (space) + space->get_broadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bt_collision_object->getBroadphaseHandle(), space->get_dispatcher()); } void CollisionObjectBullet::remove_collision_exception(const CollisionObjectBullet *p_ignoreCollisionObject) { exceptions.erase(p_ignoreCollisionObject->get_self()); bt_collision_object->setIgnoreCollisionCheck(p_ignoreCollisionObject->bt_collision_object, false); + if (space) + space->get_broadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bt_collision_object->getBroadphaseHandle(), space->get_dispatcher()); } bool CollisionObjectBullet::has_collision_exception(const CollisionObjectBullet *p_otherCollisionObject) const { diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index cbbfdac1d7..b36896650b 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -109,6 +109,7 @@ public: void flush_queries(); void step(real_t p_delta_time); + _FORCE_INLINE_ btBroadphaseInterface *get_broadphase() { return broadphase; } _FORCE_INLINE_ btCollisionDispatcher *get_dispatcher() { return dispatcher; } _FORCE_INLINE_ btSoftBodyWorldInfo *get_soft_body_world_info() { return soft_body_world_info; } _FORCE_INLINE_ bool is_using_soft_world() { return soft_body_world_info; } |