diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-05 15:20:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 15:20:46 +0200 |
| commit | bf104e78ff6a82da0f885875def32316f61962c6 (patch) | |
| tree | 535864f183ab6c2120931a640dbff9c46037b925 | |
| parent | 63d3a42f82d386c94eb9e11641d04ada4150c5e5 (diff) | |
| parent | 96093778ed864f6bcc1e924261ad3149ab18110b (diff) | |
Merge pull request #27462 from ShyRed/fixgroovejoint2d
Replace hardcoded GrooveJoint2D bias with user provided bias
| -rw-r--r-- | servers/physics_2d/joints_2d_sw.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/servers/physics_2d/joints_2d_sw.cpp b/servers/physics_2d/joints_2d_sw.cpp index 5c2242c4c5..954b0fa3ea 100644 --- a/servers/physics_2d/joints_2d_sw.cpp +++ b/servers/physics_2d/joints_2d_sw.cpp @@ -299,9 +299,7 @@ bool GrooveJoint2DSW::setup(real_t p_step) { Vector2 delta = (B->get_transform().get_origin() + rB) - (A->get_transform().get_origin() + rA); - // FIXME: We used to do this assignment and then override it with 0.001 right after. Investigate why. - //real_t _b = get_bias(); - real_t _b = 0.001; + real_t _b = get_bias(); gbias = (delta * -(_b == 0 ? space->get_constraint_bias() : _b) * (1.0 / p_step)).clamped(get_max_bias()); // apply accumulated impulse |