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/collision_solver_3d_sat.cpp | |
parent | 793000c6a90211a32b478fb550d82221e2817da0 (diff) | |
parent | d5ea4acd2dddfe13ad7989aa54d9cb5739e678d5 (diff) |
Merge pull request #46937 from nekomatata/soft-body-support
SoftBody support in GodotPhysics 3D
Diffstat (limited to 'servers/physics_3d/collision_solver_3d_sat.cpp')
-rw-r--r-- | servers/physics_3d/collision_solver_3d_sat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics_3d/collision_solver_3d_sat.cpp b/servers/physics_3d/collision_solver_3d_sat.cpp index db48f011c6..9d5448dbfa 100644 --- a/servers/physics_3d/collision_solver_3d_sat.cpp +++ b/servers/physics_3d/collision_solver_3d_sat.cpp @@ -74,9 +74,9 @@ struct _CollectorCallback { _FORCE_INLINE_ void call(const Vector3 &p_point_A, const Vector3 &p_point_B) { if (swap) { - callback(p_point_B, p_point_A, userdata); + callback(p_point_B, 0, p_point_A, 0, userdata); } else { - callback(p_point_A, p_point_B, userdata); + callback(p_point_A, 0, p_point_B, 0, userdata); } } }; @@ -685,7 +685,7 @@ public: return true; } - static _FORCE_INLINE_ void test_contact_points(const Vector3 &p_point_A, const Vector3 &p_point_B, void *p_userdata) { + static _FORCE_INLINE_ void test_contact_points(const Vector3 &p_point_A, int p_index_A, const Vector3 &p_point_B, int p_index_B, void *p_userdata) { SeparatorAxisTest<ShapeA, ShapeB, withMargin> *separator = (SeparatorAxisTest<ShapeA, ShapeB, withMargin> *)p_userdata; Vector3 axis = (p_point_B - p_point_A); real_t depth = axis.length(); |