godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed area collision report with concave

Browse Source
This commit is contained in:
Andrea Catania 2019-02-18 14:15:27 +01:00
parent 90d05cbe30
commit 66420aea9c
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;