X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=flatland.git;a=blobdiff_plain;f=polygon.h;h=0892afae49a59230f167736c9b9cce9f4fbf2301;hp=557fdd6ea9f0960d133011b8e70a9037923c95d2;hb=c99cbb5f30e1e2052bfc36880a1425db600454b5;hpb=2cd32038873961c8ff3861efb218fad75fbcbf69
diff --git a/polygon.h b/polygon.h
index 557fdd6..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
- *
- * 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 .
- *
- */
+
+ flatland is a simple 2d physical simulator
+
+ Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
+ Written by Francois Fleuret
+
+ 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 .
+
+*/
#ifndef POLYGON_H
#define POLYGON_H
@@ -122,6 +122,9 @@ public:
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);
};