asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25180 from AndreaCatania/arov

Browse source 
Fixed area overlaps if not move
This commit is contained in:
Rémi Verschelde 2019-01-21 10:39:41 +01:00 committed by GitHub
commit a0730652fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/bullet/space_bullet.cpp
View file

@ -678,11 +678,14 @@ void SpaceBullet::check_ghost_overlaps() {
// For each overlapping // For each overlapping
for (i = ghostOverlaps.size() - 1; 0 <= i; --i) { for (i = ghostOverlaps.size() - 1; 0 <= i; --i) {
bool hasOverlap = false;
btCollisionObject *overlapped_bt_co = ghostOverlaps[i]; btCollisionObject *overlapped_bt_co = ghostOverlaps[i];
RigidCollisionObjectBullet *otherObject = static_cast<RigidCollisionObjectBullet *>(overlapped_bt_co->getUserPointer()); RigidCollisionObjectBullet *otherObject = static_cast<RigidCollisionObjectBullet *>(overlapped_bt_co->getUserPointer());
if (!area->is_transform_changed() && !otherObject->is_transform_changed()) if (!area->is_transform_changed() && !otherObject->is_transform_changed()) {
continue; hasOverlap = true;
goto collision_found;
}
if (overlapped_bt_co->getUserIndex() == CollisionObjectBullet::TYPE_AREA) { if (overlapped_bt_co->getUserIndex() == CollisionObjectBullet::TYPE_AREA) {
if (!static_cast<AreaBullet *>(overlapped_bt_co->getUserPointer())->is_monitorable()) if (!static_cast<AreaBullet *>(overlapped_bt_co->getUserPointer())->is_monitorable())
@ -690,8 +693,6 @@ void SpaceBullet::check_ghost_overlaps() {
} else if (overlapped_bt_co->getUserIndex() != CollisionObjectBullet::TYPE_RIGID_BODY) } else if (overlapped_bt_co->getUserIndex() != CollisionObjectBullet::TYPE_RIGID_BODY)
continue; continue;
bool hasOverlap = false;
// For each area shape // For each area shape
for (y = area->get_shape_count() - 1; 0 <= y; --y) { for (y = area->get_shape_count() - 1; 0 <= y; --y) {
if (!area->get_bt_shape(y)->isConvex()) if (!area->get_bt_shape(y)->isConvex())