diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-07 09:18:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 09:18:11 +0100 |
| commit | 96dbf19093cfc88aa688d4321fd07c2fb9afb259 (patch) | |
| tree | d5d31273dc27f2a864bdf8620ddd2fe0a8facff5 /servers/physics_2d/body_pair_2d_sw.cpp | |
| parent | 5e19fac9872e8ba24a65bf6f9de2fdf9fa360358 (diff) | |
| parent | 13c2ff932089db24841bb971b645141218bd8586 (diff) | |
Merge pull request #14332 from akien-mga/clang-format
Update style for clang-format 5.0.0, new min required version
Diffstat (limited to 'servers/physics_2d/body_pair_2d_sw.cpp')
| -rw-r--r-- | servers/physics_2d/body_pair_2d_sw.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics_2d/body_pair_2d_sw.cpp b/servers/physics_2d/body_pair_2d_sw.cpp index 828b90e5d0..b106b37db0 100644 --- a/servers/physics_2d/body_pair_2d_sw.cpp +++ b/servers/physics_2d/body_pair_2d_sw.cpp @@ -417,7 +417,7 @@ bool BodyPair2DSW::setup(real_t p_step) { c.bias = -bias * inv_dt * MIN(0.0f, -depth + max_penetration); c.depth = depth; -//c.acc_bias_impulse=0; + //c.acc_bias_impulse=0; #ifdef ACCUMULATE_IMPULSES { @@ -500,8 +500,8 @@ void BodyPair2DSW::solve(real_t p_step) { } } -BodyPair2DSW::BodyPair2DSW(Body2DSW *p_A, int p_shape_A, Body2DSW *p_B, int p_shape_B) - : Constraint2DSW(_arr, 2) { +BodyPair2DSW::BodyPair2DSW(Body2DSW *p_A, int p_shape_A, Body2DSW *p_B, int p_shape_B) : + Constraint2DSW(_arr, 2) { A = p_A; B = p_B; |