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

Merge pull request #26014 from AndreaCatania/bugfix

Browse source 
Fixed area collision report with concave
This commit is contained in:
Rémi Verschelde 2019-02-18 15:24:09 +01:00 committed by GitHub
commit 049bb75f9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/bullet/space_bullet.cpp
View file

@ -686,7 +686,7 @@ void SpaceBullet::check_ghost_overlaps() {
btVector3 other_body_scale(otherObject->get_bt_body_scale()); btVector3 other_body_scale(otherObject->get_bt_body_scale());
if (!area->is_transform_changed() && !otherObject->is_transform_changed()) { if (!area->is_transform_changed() && !otherObject->is_transform_changed()) {
hasOverlap = true; hasOverlap = -1 != area->find_overlapping_object(otherObject);
goto collision_found; goto collision_found;
} }
@ -715,6 +715,9 @@ void SpaceBullet::check_ghost_overlaps() {
other_body_shape = static_cast<btCollisionShape *>(otherObject->get_bt_shape(z)); other_body_shape = static_cast<btCollisionShape *>(otherObject->get_bt_shape(z));
if (other_body_shape->isConcave())
continue;
btTransform other_shape_transform(otherObject->get_bt_shape_transform(z)); btTransform other_shape_transform(otherObject->get_bt_shape_transform(z));
other_shape_transform.getOrigin() *= other_body_scale; other_shape_transform.getOrigin() *= other_body_scale;