summaryrefslogtreecommitdiff
path: root/servers/physics_2d
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-08-29 12:51:26 +0200
committerGitHub <noreply@github.com>2020-08-29 12:51:26 +0200
commitedac127f91a7acd72a6845d277baa28615a0613e (patch)
treeae012ac4199d3e7729c3c94f3147433da35ab6d3 /servers/physics_2d
parent5abb53be689475cf368b1d032bd3aecbe0f18051 (diff)
parent0205eef96bbdc59c4a52c8323f9a39c717543bec (diff)
Merge pull request #41584 from TwistedTwigleg/Godot_Physics_2D_Regression_Fix
Godot master 2D Physics Regression fix
Diffstat (limited to 'servers/physics_2d')
-rw-r--r--servers/physics_2d/body_pair_2d_sw.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_2d/body_pair_2d_sw.cpp b/servers/physics_2d/body_pair_2d_sw.cpp
index 5997959432..2021aab17c 100644
--- a/servers/physics_2d/body_pair_2d_sw.cpp
+++ b/servers/physics_2d/body_pair_2d_sw.cpp
@@ -478,8 +478,8 @@ void BodyPair2DSW::solve(real_t p_step) {
Vector2 jb = c.normal * (c.acc_bias_impulse - jbnOld);
- A->apply_bias_impulse(c.rA, -jb);
- B->apply_bias_impulse(c.rB, jb);
+ A->apply_bias_impulse(-jb, c.rA);
+ B->apply_bias_impulse(jb, c.rB);
real_t jn = -(c.bounce + vn) * c.mass_normal;
real_t jnOld = c.acc_normal_impulse;