X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=flatland.git;a=blobdiff_plain;f=universe.cc;h=02f189c62e4741ab13add2385deaefbcee82c608;hp=b897d0ca475548249d627cfc8f991d850907dfd2;hb=c99cbb5f30e1e2052bfc36880a1425db600454b5;hpb=2cd32038873961c8ff3861efb218fad75fbcbf69

diff --git a/universe.cc b/universe.cc
index b897d0c..02f189c 100644
--- a/universe.cc
+++ b/universe.cc
@@ -1,26 +1,26 @@
 
 /*
- *  dyncnn is a deep-learning algorithm for the prediction of
- *  interacting object dynamics
- *
- *  Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
- *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
- *
- *  This file is part of dyncnn.
- *
- *  dyncnn is free software: you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
- *
- *  dyncnn is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with dyncnn.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
+
+   flatland is a simple 2d physical simulator
+
+   Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+   Written by Francois Fleuret <francois.fleuret@idiap.ch>
+
+   This file is part of flatland
+
+   flatland is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License version 3 as
+   published by the Free Software Foundation.
+
+   flatland is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with flatland.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
 
 #include <string.h>
 
@@ -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;
@@ -154,6 +159,14 @@ void Universe::draw(Canvas *canvas) {
   }
 }
 
+void Universe::apply_gravity(scalar_t dt, scalar_t fx, scalar_t fy) {
+  for(int n = 0; n < _nb_polygons; n++)
+    if(_polygons[n])
+      _polygons[n]->apply_force(dt,
+                                _polygons[n]->_center_x, _polygons[n]->_center_y,
+                                fx, fy);
+}
+
 void Universe::apply_collision_forces(scalar_t dt) {
   const int nb_axis = 2;
   int nb_collision[_nb_polygons * _nb_polygons];