X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=flatland.git;a=blobdiff_plain;f=sequence_generator.cc;h=bfba036621e9e4e8896ceeb6772d5af696736429;hp=ddc337b13e8332e7d14810e2cb693f0820178b53;hb=4a824920ad843ba0d1bd3d9b10a8eb0188a2bc63;hpb=7e2780052c458a329fc36253b83eb5194ffb7fed

diff --git a/sequence_generator.cc b/sequence_generator.cc
index ddc337b..bfba036 100644
--- a/sequence_generator.cc
+++ b/sequence_generator.cc
@@ -69,6 +69,7 @@ extern "C" void fl_generate_sequence(int nb_images,
                                      int width, int height,
                                      int nb_shapes,
                                      int random_shape_size, int random_colors,
+                                     int pulling,
                                      unsigned char *output) {
 
   const scalar_t super_definition = 8;
@@ -115,12 +116,14 @@ extern "C" void fl_generate_sequence(int nb_images,
   const int max_total_nb_attempts = 1000000;
 
   do {
-    if(random_grasp) {
-      grab_start_x = world_width * (0.1 + 0.8 * drand48());
-      grab_start_y = world_height * (0.1 + 0.8 * drand48());
-    } else {
-      grab_start_x = world_width * 0.5;
-      grab_start_y = world_height * 0.75;
+    if(pulling) {
+      if(random_grasp) {
+        grab_start_x = world_width * (0.1 + 0.8 * drand48());
+        grab_start_y = world_height * (0.1 + 0.8 * drand48());
+      } else {
+        grab_start_x = world_width * 0.5;
+        grab_start_y = world_height * 0.75;
+      }
     }
 
     do {
@@ -188,45 +191,41 @@ extern "C" void fl_generate_sequence(int nb_images,
         }
       }
 
-      grabbed_polygon = universe->pick_polygon(grab_start_x, grab_start_y);
-
-    } while(!grabbed_polygon);
+      if(pulling) {
+        grabbed_polygon = universe->pick_polygon(grab_start_x, grab_start_y);
+      }
+    } while(pulling and !grabbed_polygon);
 
     failed = 0;
 
-    scalar_t grab_relative_x = grabbed_polygon->relative_x(grab_start_x, grab_start_y);
-    scalar_t grab_relative_y = grabbed_polygon->relative_y(grab_start_x, grab_start_y);
+    scalar_t grab_relative_x, grab_relative_y;
+
+    if(pulling) {
+      grab_relative_x = grabbed_polygon->relative_x(grab_start_x, grab_start_y);
+      grab_relative_y = grabbed_polygon->relative_y(grab_start_x, grab_start_y);
+    }
 
     for(int s = 0; !failed && s < nb_simulated_frames; s++) {
       if(s % every_nth == 0) {
         int t = s / every_nth;
-        // scalar_t xf = grabbed_polygon->absolute_x(grab_relative_x, grab_relative_y);
-        // scalar_t yf = grabbed_polygon->absolute_y(grab_relative_x, grab_relative_y);
-
-        // canvases[2 * t + 0]->clear();
-        // draw_grabbing_point_on_canvas(canvases[2 * t + 0], scaling,
-        // xf, yf, 0.0, 0.0, 0.0);
-        // canvases[2 * t + 1]->clear();
-        // draw_universe_on_canvas(canvases[2 * t + 1], scaling, universe);
 
         canvases[t]->clear();
         draw_universe_on_canvas(canvases[t], scaling, universe);
-
-        // if(show_grabbing_point) {
-        // draw_grabbing_point_on_canvas(canvases[2 * t + 1], scaling,
-        // xf, yf, 1.0, 0.0, 0.0);
-        // }
       }
 
       if(s < nb_simulated_frames - 1) {
         // Run the simulation
         for(int i = 0; i < nb_iterations_per_steps; i++) {
-          scalar_t xf = grabbed_polygon->absolute_x(grab_relative_x, grab_relative_y);
-          scalar_t yf = grabbed_polygon->absolute_y(grab_relative_x, grab_relative_y);
-          if (xf < 0 || xf >= world_width || yf < 0 || yf >= world_height) {
-            failed = 1;
+          if(pulling) {
+            scalar_t xf = grabbed_polygon->absolute_x(grab_relative_x, grab_relative_y);
+            scalar_t yf = grabbed_polygon->absolute_y(grab_relative_x, grab_relative_y);
+            if (xf < 0 || xf >= world_width || yf < 0 || yf >= world_height) {
+              failed = 1;
+            }
+            grabbed_polygon->apply_force(dt, xf, yf, 0.0, -1.0);
+          } else {
+            // Gravity
           }
-          grabbed_polygon->apply_force(dt, xf, yf, 0.0, -1.0);
           universe->update(dt, 1.0 / scaling);
         }
       }