godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72107 from rburing/separation_ray_normal

Browse Source 
Fix separation ray normal direction
This commit is contained in:
Rémi Verschelde 2023-01-31 10:54:34 +01:00
commit dfb824c1d1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/physics_3d/godot_collision_solver_3d.cpp
View File

@ -127,11 +127,10 @@ bool GodotCollisionSolver3D::solve_separation_ray(const GodotShape3D *p_shape_A,
} }
if (p_result_callback) { if (p_result_callback) {
if (p_swap_result) {
Vector3 normal = (support_B - support_A).normalized(); Vector3 normal = (support_B - support_A).normalized();
p_result_callback(support_B, 0, support_A, 0, normal, p_userdata); if (p_swap_result) {
p_result_callback(support_B, 0, support_A, 0, -normal, p_userdata);
} else { } else {
Vector3 normal = (support_A - support_B).normalized();
p_result_callback(support_A, 0, support_B, 0, normal, p_userdata); p_result_callback(support_A, 0, support_B, 0, normal, p_userdata);
} }
} }