diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-20 21:45:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 21:45:20 +0100 |
| commit | fa681d04b7434c3db8c556d5fc046b702c731d98 (patch) | |
| tree | a39079990bae6c4227cc16d90db274ffe1119c87 /servers/physics_3d/gjk_epa.cpp | |
| parent | 793000c6a90211a32b478fb550d82221e2817da0 (diff) | |
| parent | d5ea4acd2dddfe13ad7989aa54d9cb5739e678d5 (diff) | |
| download | redot-engine-fa681d04b7434c3db8c556d5fc046b702c731d98.tar.gz | |
Merge pull request #46937 from nekomatata/soft-body-support
SoftBody support in GodotPhysics 3D
Diffstat (limited to 'servers/physics_3d/gjk_epa.cpp')
| -rw-r--r-- | servers/physics_3d/gjk_epa.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_3d/gjk_epa.cpp b/servers/physics_3d/gjk_epa.cpp index e44c92da79..1a8c7f704f 100644 --- a/servers/physics_3d/gjk_epa.cpp +++ b/servers/physics_3d/gjk_epa.cpp @@ -1011,9 +1011,9 @@ bool gjk_epa_calculate_penetration(const Shape3DSW *p_shape_A, const Transform & if (GjkEpa2::Penetration(p_shape_A, p_transform_A, p_margin_A, p_shape_B, p_transform_B, p_margin_B, p_transform_B.origin - p_transform_A.origin, res)) { if (p_result_callback) { if (p_swap) { - p_result_callback(res.witnesses[1], res.witnesses[0], p_userdata); + p_result_callback(res.witnesses[1], 0, res.witnesses[0], 0, p_userdata); } else { - p_result_callback(res.witnesses[0], res.witnesses[1], p_userdata); + p_result_callback(res.witnesses[0], 0, res.witnesses[1], 0, p_userdata); } } return true; |