diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-30 02:18:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 02:18:01 +0200 |
| commit | bcd1fc832fff5c1cc1efa4d2450b9e2919b972c9 (patch) | |
| tree | 29faf789f29140425af80b605a4c08b472a68f77 /servers/physics_2d/space_2d_sw.cpp | |
| parent | 9b8095ad05d41d0bd3aa2afbdd2228b064b49d1b (diff) | |
| parent | 9758a75221854b5ed533bc826ebba1beb7f8cf3f (diff) | |
Merge pull request #49901 from nekomatata/move-and-collide-fix-slide
Fix move_and_collide causing sliding on slopes
Diffstat (limited to 'servers/physics_2d/space_2d_sw.cpp')
| -rw-r--r-- | servers/physics_2d/space_2d_sw.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index 1380e57b57..905f08011b 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -1142,6 +1142,9 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body, const Transform2D &p_from, co r_result->collision_local_shape = rcd.best_local_shape; r_result->collision_normal = rcd.best_normal; r_result->collision_point = rcd.best_contact; + r_result->collision_depth = rcd.best_len; + r_result->collision_safe_fraction = safe; + r_result->collision_unsafe_fraction = unsafe; r_result->collider_metadata = rcd.best_object->get_shape_metadata(rcd.best_shape); const Body2DSW *body = static_cast<const Body2DSW *>(rcd.best_object); |