X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=flatland.git;a=blobdiff_plain;f=universe.cc;h=32e6f335bb7a2c9203e0cdd4ca3783c5220fcdad;hp=2b1383d3f7b1459ec619b4b37e0226e8d5172a27;hb=7e2780052c458a329fc36253b83eb5194ffb7fed;hpb=26abc735ca75a78974c7ced091035e8c27ca1c00 diff --git a/universe.cc b/universe.cc index 2b1383d..32e6f33 100644 --- a/universe.cc +++ b/universe.cc @@ -62,6 +62,11 @@ void Universe::add_polygon(Polygon *p) { } } +bool Universe::collide_with_borders(Polygon *p, scalar_t padding) { + return p->collide_with_borders(padding, padding,_width - padding, _height - padding); + +} + bool Universe::collide(Polygon *p) { for(int n = 0; n < _nb_polygons; n++) if(_polygons[n] && _polygons[n]->collide(p)) return true; @@ -122,11 +127,13 @@ void Universe::compute_pseudo_collisions(int nb_axis, int *nb_colliding_axis) { } } -bool Universe::update(scalar_t dt) { +bool Universe::update(scalar_t dt, scalar_t padding) { bool result = false; apply_collision_forces(dt); for(int n = 0; n < _nb_polygons; n++) if(_polygons[n]) { - _polygons[n]->apply_border_forces(dt, _width, _height); + _polygons[n]->apply_border_forces(dt, + padding, padding, + _width - padding, _height - padding); result |= _polygons[n]->update(dt); } return result;