godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

-Fix problem in OWC logic closes #11357

Browse Source 
-Fix problem with kinematic move and disabled shapes, in both 2D and 3D
This commit is contained in:
Juan Linietsky
2018-11-02 15:44:29 -03:00
parent 03563c8ddf
commit 64f649a80c
3 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
servers/physics/space_sw.cpp
View File

@@ -544,14 +544,24 @@ int SpaceSW::test_body_ray_separation(BodySW *p_body, const Transform &p_transfo
AABB body_aabb;
bool shapes_found = false;
for (int i = 0; i < p_body->get_shape_count(); i++) {
if (i == 0)
if (p_body->is_shape_set_as_disabled(i))
continue;
if (!shapes_found) {
body_aabb = p_body->get_shape_aabb(i);
else
shapes_found = true;
} else {
body_aabb = body_aabb.merge(p_body->get_shape_aabb(i));
}
}
if (!shapes_found) {
return 0;
}
// Undo the currently transform the physics server is aware of and apply the provided one
body_aabb = p_transform.xform(p_body->get_inv_transform().xform(body_aabb));
body_aabb = body_aabb.grow(p_margin);
@@ -691,13 +701,23 @@ bool SpaceSW::test_body_motion(BodySW *p_body, const Transform &p_from, const Ve
r_result->collider_shape = 0;
}
AABB body_aabb;
bool shapes_found = false;
for (int i = 0; i < p_body->get_shape_count(); i++) {
if (i == 0)
if (p_body->is_shape_set_as_disabled(i))
continue;
if (!shapes_found) {
body_aabb = p_body->get_shape_aabb(i);
else
shapes_found = true;
} else {
body_aabb = body_aabb.merge(p_body->get_shape_aabb(i));
}
}
if (!shapes_found) {
return false;
}
// Undo the currently transform the physics server is aware of and apply the provided one