diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-07 00:25:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-07 00:25:37 -0300 |
| commit | 5064cc50066e2b6783805d77cf41a3552a4d155c (patch) | |
| tree | 454ce9e663ae55a7c117707e4d7ad6109781c865 /servers/physics_2d/body_2d_sw.cpp | |
| parent | b524b40fdc5325c840192ce92dbed8108ccef2d9 (diff) | |
| parent | 590afbcac461f87b05391996ca85d32627c81a75 (diff) | |
Merge pull request #1932 from Faless/gravity_distance_full
Calculate gravity based on distance from body to gravity point
Diffstat (limited to 'servers/physics_2d/body_2d_sw.cpp')
| -rw-r--r-- | servers/physics_2d/body_2d_sw.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp index ccce058f13..38835c9a82 100644 --- a/servers/physics_2d/body_2d_sw.cpp +++ b/servers/physics_2d/body_2d_sw.cpp @@ -383,9 +383,12 @@ void Body2DSW::set_space(Space2DSW *p_space){ void Body2DSW::_compute_area_gravity(const Area2DSW *p_area) { if (p_area->is_gravity_point()) { - - gravity += (p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin()).normalized() * p_area->get_gravity(); - + if(p_area->get_gravity_distance_scale() > 0) { + Vector2 v = p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin(); + gravity += v.normalized() * (p_area->get_gravity() / Math::pow(v.length() * p_area->get_gravity_distance_scale()+1, 2) ); + } else { + gravity += (p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin()).normalized() * p_area->get_gravity(); + } } else { gravity += p_area->get_gravity_vector() * p_area->get_gravity(); } |