diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-17 11:05:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 11:05:13 +0100 |
| commit | af0806722f465d505976bfb07eccd724759fba48 (patch) | |
| tree | 29dc68d12762bc9219e59f41656170a29116ef00 /servers/physics_3d/gjk_epa.h | |
| parent | 36514062585a12c8ea78a5b4da70a3be2b6f20b9 (diff) | |
| parent | 93076ef1178fa09710a155cbfb444a9669b87963 (diff) | |
Merge pull request #47067 from nekomatata/cylinder-fix-margins
Fix Cylinder shape collision with margins when using GJK-EPA
Diffstat (limited to 'servers/physics_3d/gjk_epa.h')
| -rw-r--r-- | servers/physics_3d/gjk_epa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_3d/gjk_epa.h b/servers/physics_3d/gjk_epa.h index be3ba4e664..a7e2e1719e 100644 --- a/servers/physics_3d/gjk_epa.h +++ b/servers/physics_3d/gjk_epa.h @@ -34,7 +34,7 @@ #include "collision_solver_3d_sw.h" #include "shape_3d_sw.h" -bool gjk_epa_calculate_penetration(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, CollisionSolver3DSW::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false); +bool gjk_epa_calculate_penetration(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, CollisionSolver3DSW::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, real_t p_margin_A = 0.0, real_t p_margin_B = 0.0); bool gjk_epa_calculate_distance(const Shape3DSW *p_shape_A, const Transform &p_transform_A, const Shape3DSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_result_A, Vector3 &r_result_B); #endif |