projects
/
flatland.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[flatland.git]
/
universe.cc
diff --git
a/universe.cc
b/universe.cc
index
2b1383d
..
32e6f33
100644
(file)
--- 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;
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]) {
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;
result |= _polygons[n]->update(dt);
}
return result;