diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-20 17:35:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-20 17:35:54 +0100 |
| commit | d3ff3dc6ce96ef1d9d513917ff61abe62e266c19 (patch) | |
| tree | 0bd41629971ae9e5bdf3c9b5b45246a34de6c15e | |
| parent | fc4d90e70dec61715c3d22014e6d47f30a267b16 (diff) | |
| parent | 583ab9ce7a13ecade73758c841f5a6341951b666 (diff) | |
Merge pull request #44543 from Exxion/GD3D-collisions
Fixes collisions in Godot 3D physics
| -rw-r--r-- | servers/physics_3d/body_pair_3d_sw.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics_3d/body_pair_3d_sw.cpp b/servers/physics_3d/body_pair_3d_sw.cpp index 848138940e..d8f187a7f8 100644 --- a/servers/physics_3d/body_pair_3d_sw.cpp +++ b/servers/physics_3d/body_pair_3d_sw.cpp @@ -367,8 +367,8 @@ void BodyPair3DSW::solve(real_t p_step) { Vector3 jb = c.normal * (c.acc_bias_impulse - jbnOld); - A->apply_bias_impulse(c.rA + A->get_center_of_mass(), -jb, MAX_BIAS_ROTATION / p_step); - B->apply_bias_impulse(c.rB + B->get_center_of_mass(), jb, MAX_BIAS_ROTATION / p_step); + A->apply_bias_impulse(-jb, c.rA + A->get_center_of_mass(), MAX_BIAS_ROTATION / p_step); + B->apply_bias_impulse(jb, c.rB + B->get_center_of_mass(), MAX_BIAS_ROTATION / p_step); crbA = A->get_biased_angular_velocity().cross(c.rA); crbB = B->get_biased_angular_velocity().cross(c.rB); @@ -383,8 +383,8 @@ void BodyPair3DSW::solve(real_t p_step) { Vector3 jb_com = c.normal * (c.acc_bias_impulse_center_of_mass - jbnOld_com); - A->apply_bias_impulse(A->get_center_of_mass(), -jb_com, 0.0f); - B->apply_bias_impulse(B->get_center_of_mass(), jb_com, 0.0f); + A->apply_bias_impulse(-jb_com, A->get_center_of_mass(), 0.0f); + B->apply_bias_impulse(jb_com, B->get_center_of_mass(), 0.0f); } c.active = true; |