X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=flatland.git;a=blobdiff_plain;f=polygon.cc;h=b8999503e3c14cec184aa0820c33574da269bd60;hp=ba629c5734bd12b7b622c3f954fe67060dda21a0;hb=c99cbb5f30e1e2052bfc36880a1425db600454b5;hpb=c1f1040936d977cd2b3a276c725e223198377d2a

diff --git a/polygon.cc b/polygon.cc
index ba629c5..b899950 100644
--- a/polygon.cc
+++ b/polygon.cc
@@ -31,7 +31,8 @@ using namespace std;
 
 static const scalar_t dl = 20.0;
 static const scalar_t repulsion_constant = 0.2;
-static const scalar_t dissipation = 0.5;
+static const scalar_t speed_max = 1e2;
+static const scalar_t angular_speed_max = M_PI / 10;
 
 Polygon::Polygon(scalar_t mass,
                  scalar_t red, scalar_t green, scalar_t blue,
@@ -306,17 +307,27 @@ void Polygon::initialize(int nb_polygons) {
 }
 
 bool Polygon::update(scalar_t dt) {
+  scalar_t speed = sqrt(_dcenter_x * _dcenter_x + _dcenter_y * _dcenter_y);
+
+  if(speed > 0) {
+    scalar_t speed_target = speed_max - exp(-speed / speed_max) * speed_max;
+    _dcenter_x = speed_target * _dcenter_x / speed;
+    _dcenter_y = speed_target * _dcenter_y / speed;
+  }
+
+  scalar_t angular_speed = abs(_dtheta);
+
+  if(angular_speed > 0) {
+    scalar_t angular_speed_target = angular_speed_max - exp(-angular_speed / angular_speed_max) * angular_speed_max;
+    _dtheta = angular_speed_target * _dtheta / angular_speed;
+  }
+
   if(!_nailed) {
     _center_x += _dcenter_x * dt;
     _center_y += _dcenter_y * dt;
     _theta += _dtheta * dt;
   }
 
-  scalar_t d = exp(log(dissipation) * dt);
-  _dcenter_x *= d;
-  _dcenter_y *= d;
-  _dtheta *= d;
-
   scalar_t vx = cos(_theta), vy = sin(_theta);
 
   for(int n = 0; n < _nb_vertices; n++) {
@@ -366,11 +377,15 @@ void Polygon::apply_border_forces(scalar_t dt,
       scalar_t x = _x[v] * (1 - s) + _x[vp] * s;
       scalar_t y = _y[v] * (1 - s) + _y[vp] * s;
       scalar_t vx = 0, vy = 0;
-      if(x < xmin) vx = xmin - x;
+      if(x < xmin) vx = x - xmin;
       else if(x > xmax) vx = x - xmax;
-      if(y < ymin) vy = ymin - y;
+      if(y < ymin) vy = y - ymin;
       else if(y > ymax) vy = y - ymax;
-      apply_force(dt, x, y, - dl * vx * repulsion_constant, - dl * vy * repulsion_constant);
+      if(vx != 0 || vy != 0) {
+        // cerr << "apply_border_forces vx = " << vx << " vy = " << vy << endl;
+        apply_force(dt, x, y,
+                    - dl * vx * repulsion_constant, - dl * vy * repulsion_constant);
+      }
     }
   }
 }