X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=flatland.git;a=blobdiff_plain;f=polygon.h;h=0892afae49a59230f167736c9b9cce9f4fbf2301;hp=8e23a7059b6c0cacf928bcae7a624d8836cc2e4d;hb=HEAD;hpb=26abc735ca75a78974c7ced091035e8c27ca1c00

diff --git a/polygon.h b/polygon.h
index 8e23a70..0892afa 100644
--- a/polygon.h
+++ b/polygon.h
@@ -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/>.
+
+*/
 
 #ifndef POLYGON_H
 #define POLYGON_H
@@ -119,9 +119,12 @@ public:
   scalar_t absolute_y(scalar_t rx, scalar_t ry);
 
   void apply_force(scalar_t dt, scalar_t x, scalar_t y, scalar_t fx, scalar_t fy);
-  void apply_border_forces(scalar_t dt, scalar_t xmax, scalar_t ymax);
+  void apply_border_forces(scalar_t dt, scalar_t xmin, scalar_t ymin, scalar_t xmax, scalar_t ymax);
   void apply_collision_forces(scalar_t dt, int n_polygon, Polygon *p);
 
+  bool collide_with_borders(scalar_t xmin, scalar_t ymin,
+                            scalar_t xmax, scalar_t ymax);
+
   bool collide(Polygon *p);
 };