diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-19 19:33:54 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-19 19:33:54 +0100 |
| commit | 88cbd5d42266b57e9ca8a0727640082fb303cef3 (patch) | |
| tree | d534d85d0ce60bc6cab9e3e7e1f9eda5519bfac9 /servers/physics_3d/godot_collision_solver_3d.h | |
| parent | 65883cc73b0bedb14760e97f59a2c58b83b2470c (diff) | |
| parent | 31c2a2489392991c9870f21092f86df6f8bd9c9c (diff) | |
Merge pull request #71447 from peastman/normals
Analytic collision normals
Diffstat (limited to 'servers/physics_3d/godot_collision_solver_3d.h')
| -rw-r--r-- | servers/physics_3d/godot_collision_solver_3d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_3d/godot_collision_solver_3d.h b/servers/physics_3d/godot_collision_solver_3d.h index 7ef0dc97ac..36ea79576e 100644 --- a/servers/physics_3d/godot_collision_solver_3d.h +++ b/servers/physics_3d/godot_collision_solver_3d.h @@ -35,11 +35,11 @@ class GodotCollisionSolver3D { public: - typedef void (*CallbackResult)(const Vector3 &p_point_A, int p_index_A, const Vector3 &p_point_B, int p_index_B, void *p_userdata); + typedef void (*CallbackResult)(const Vector3 &p_point_A, int p_index_A, const Vector3 &p_point_B, int p_index_B, const Vector3 &normal, void *p_userdata); private: static bool soft_body_query_callback(uint32_t p_node_index, void *p_userdata); - static void soft_body_contact_callback(const Vector3 &p_point_A, int p_index_A, const Vector3 &p_point_B, int p_index_B, void *p_userdata); + static void soft_body_contact_callback(const Vector3 &p_point_A, int p_index_A, const Vector3 &p_point_B, int p_index_B, const Vector3 &normal, void *p_userdata); static bool soft_body_concave_callback(void *p_userdata, GodotShape3D *p_convex); static bool concave_callback(void *p_userdata, GodotShape3D *p_convex); static bool solve_static_world_boundary(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, CallbackResult p_result_callback, void *p_userdata, bool p_swap_result, real_t p_margin = 0); |