mechanism to replay latest command, command to compute surface mesh intersection in geobox

Author: BrunoLevy

src/bin/geobox/main.cpp

@@ -67,6 +67,7 @@
 
 #include <geogram/third_party/PoissonRecon/poisson_geogram.h>
 
+#include <geogram/basic/stopwatch.h>
 #include <geogram/basic/command_line.h>
 #include <geogram/basic/command_line_args.h>
 #include <geogram/basic/file_system.h>
@@ -272,8 +273,6 @@ namespace {
 	    texture_ = 0;
 	    checker_texture_ = 0;
 	    texture_mode_ = NO_TEXTURE;
-            add_key_func("F5", autorepair);
-            locked_ = false;
         }
 
 	void geogram_initialize(int argc, char** argv) override {
@@ -474,6 +473,20 @@ namespace {
                     );
 		}
 
+                if(ImGui::MenuItem("intersect")) {
+                    GEO::Command::set_current(
+                        "void intersect("
+                        "bool neighbors = true" 
+                        "  [test neighboring triangles for intersections],"
+                        "bool union = true"
+                        "  [removes internal shells],"
+                        "bool coplanar = true"
+                        "  [re-triangulate sets of coplanar facets]"
+                        ") [removes surface mesh intersections]",
+                        this, &GeoBoxApplication::intersect
+                    );
+                }
+                
 		if(ImGui::MenuItem("keep largest part")) {
 		    GEO::Command::set_current(
 			"void keep_largest_component( "
@@ -706,9 +719,11 @@ namespace {
 	    texture_filename_ = "";
 	    bool result = SimpleMeshApplication::load(filename);
 	    if(result && FileSystem::extension(filename) == "stl") {
+                locked_ = true;
 		begin();
 		mesh_repair(mesh_);
-		end(); 
+		end();
+                locked_ = false;
 	    }
 
 	    std::string tex_file_name =
@@ -1043,7 +1058,29 @@ namespace {
             end();
         }
 
-
+        void intersect(
+            bool detect_intersecting_neighbors = true,
+            bool remove_internal_shells = true,
+            bool simplify_coplanar_facets = true
+        ) {
+            begin();
+            MeshSurfaceIntersection intersection(mesh_);
+            intersection.set_delaunay(true);
+            intersection.set_detect_intersecting_neighbors(
+                detect_intersecting_neighbors
+            );
+            intersection.set_verbose(false);
+            intersection.set_radial_sort(remove_internal_shells);
+            intersection.intersect();
+            if(remove_internal_shells) {
+                intersection.remove_internal_shells();
+            }
+            if(simplify_coplanar_facets) {
+                intersection.simplify_coplanar_facets();
+            }
+            end();
+        }
+        
         void remesh_smooth(
             index_t nb_points = 30000,
             double tri_shape_adapt = 1.0,
@@ -1644,7 +1681,6 @@ namespace {
 	 *  for all geometry processing functions.
 	 */
         void begin() {
-            locked_ = true;
             mesh()->vertices.set_double_precision();            
         }
 
@@ -1671,7 +1707,6 @@ namespace {
             if(mesh()->facets.nb() == 0 && mesh()->cells.nb() == 0) {
                 show_vertices();
             }
-            locked_ = false;
         }
 
 	/**
@@ -1852,30 +1887,12 @@ namespace {
 	    glupDisable(GLUP_NORMAL_MAPPING);
 	}
 
-    protected:
-        static void autorepair() {
-            GeoBoxApplication* app =
-                static_cast<GeoBoxApplication*>(instance());
-            app->begin();
-            MeshSurfaceIntersection intersection(app->mesh_);
-            intersection.set_delaunay(true);
-            intersection.set_detect_intersecting_neighbors(true);
-            intersection.set_verbose(false);
-            intersection.set_radial_sort(true);
-            intersection.intersect();
-            intersection.remove_internal_shells();
-            intersection.simplify_coplanar_facets();
-            app->end();
-        }
-        
     protected:
 	std::string texture_filename_;
 	Image_var texture_image_;
 	GLuint texture_;
 	GLuint checker_texture_;
 	TextureMode texture_mode_;
-        bool locked_; // to avoid weird behavior when pressing up/down while
-                      // command or mesh repair is running.
     };
 }
 

src/lib/geogram_gfx/gui/command.cpp

@@ -108,10 +108,23 @@ namespace GEO {
         if(queued_ != nullptr) {
             // Steal the queued command to avoid
             // infinite recursion.
+            /*
             SmartPointer<Command> queued = queued_;
             queued_ = nullptr;
             queued->apply();
 	    *(queued->is_visible_ptr()) = false;
+            */
+
+            latest_ = queued_;
+            queued_ = nullptr;
+            latest_->apply();
+            *(latest_->is_visible_ptr()) = false;
+        }
+    }
+
+    void Command::replay_latest() {
+        if(!latest_.is_null()) {
+            latest_->apply();
         }
     }
 
@@ -546,5 +559,6 @@ namespace GEO {
 
     SmartPointer<Command> Command::current_;
     SmartPointer<Command> Command::queued_;
+    SmartPointer<Command> Command::latest_;
 }
 

src/lib/geogram_gfx/gui/command.h

@@ -211,6 +211,12 @@ namespace GEO {
          *  it would nest two ImGUI handlers, which is not allowed.
          */
         static void flush_queue();
+
+
+        /**
+         * \brief Replays the latest invoked command
+         */
+        static void replay_latest();
 
         /**
          * \brief Command constructor.
@@ -307,6 +313,18 @@ namespace GEO {
             return current_;
         }
 
+
+        /**
+         * \brief Gets the latest command.
+         * \return a pointer to the command that was last executed.
+         * \details Used by playback mechanism ('F5' in applications).
+         */
+        static Command* latest() {
+            return latest_;
+        }
+
+
+        
         /**
          * \brief Resets the current command.
          */
@@ -1023,10 +1041,6 @@ namespace GEO {
             args_[i] = Arg("arg " + String::to_string(i), default_val);
         }
 
-	static void set_queued(Command* command) {
-	    queued_ = command;
-	}
-	
     private:
 
         /**
@@ -1191,6 +1205,7 @@ namespace GEO {
             geo_assert(i < args_.size());
             return args_[i];
         }
+
 
     private:
         std::string name_;
@@ -1205,6 +1220,7 @@ namespace GEO {
         bool auto_create_args_; 
         static SmartPointer<Command> current_;
         static SmartPointer<Command> queued_;
+        static SmartPointer<Command> latest_;
     };
 
 /***********************************************************************/

src/lib/geogram_gfx/gui/simple_application.cpp

@@ -43,6 +43,7 @@
 #include <geogram/basic/string.h>
 #include <geogram/basic/logger.h>
 #include <geogram/basic/command_line.h>
+#include <geogram/basic/stopwatch.h>
 #include <geogram/bibliography/bibliography.h>
 
 #include <geogram_gfx/full_screen_effects/ambient_occlusion.h>
@@ -164,6 +165,9 @@ namespace GEO {
 	add_key_toggle("F8",  &object_properties_visible_, "object properties");
 	add_key_toggle("F9",  &console_visible_, "console");
 	add_key_toggle("F12", &menubar_visible_, "menubar");
+
+        add_key_func("F5", replay_latest_command, "replay latest command");
+        
 	set_region_of_interest(0.0, 0.0, 0.0, 1.0, 1.0, 1.0);
 
 	object_translation_ = vec3(0.0, 0.0, 0.0);
@@ -194,6 +198,7 @@ namespace GEO {
 	);
 
 	props_pinned_ = false;
+        locked_ = false;
     }
 
     SimpleApplication::~SimpleApplication() {
@@ -1147,7 +1152,12 @@ namespace GEO {
     }
 
     void SimpleApplication::post_draw() {
+        if(locked_) {
+            return;
+        }
+        locked_ = true;
 	Command::flush_queue();
+        locked_ = false;
     }
 
     void SimpleApplication::mouse_button_callback(
@@ -1511,5 +1521,18 @@ namespace GEO {
 	    load(f[i]);
 	}
     }
+
+    void SimpleApplication::replay_latest_command() {
+        if(instance()->locked_ || Command::latest() == nullptr) {
+            return;
+        }
+        Logger::out("Command") << Command::latest()->name() << " start..."
+                               << std::endl;
+        instance()->draw(); // so that we can see the logger message
+        Stopwatch W("Command");
+        instance()->locked_ = true;
+        Command::replay_latest();
+        instance()->locked_ = false;
+    }
 }
 

src/lib/geogram_gfx/gui/simple_application.h

@@ -486,8 +486,12 @@ namespace GEO {
 	virtual const char* default_layout() const;
 	virtual const char* default_layout_android_vertical() const;
 	virtual const char* default_layout_android_horizontal() const;		
-	
+
+      protected:
+        static void replay_latest_command();
+        
       protected:
+        bool locked_; // avoid starting command when command is running
 	bool lighting_;
 	bool edit_light_;
 	bool clipping_;

src/lib/geogram_gfx/gui/simple_mesh_application.cpp

@@ -359,6 +359,13 @@ namespace GEO {
             }
         } while(MeshIOHandler::get_handler(*it) == nullptr);
         instance()->load(*it);
+        Logger::out("I/O") << "Loaded " << FileSystem::base_name(*it)
+                           << "."
+                           << FileSystem::extension(*it)
+                           << " (" << (it - files.begin() + 1)
+                           << "/"
+                           << files.size() << ")"
+                           << std::endl;
     }
 
     void SimpleMeshApplication::next_file() {
@@ -384,6 +391,13 @@ namespace GEO {
             }
         } while(MeshIOHandler::get_handler(*it) == nullptr);
         instance()->load(*it);
+        Logger::out("I/O") << "Loaded " << FileSystem::base_name(*it)
+                           << "."
+                           << FileSystem::extension(*it)
+                           << " (" << (it - files.begin() + 1)
+                           << "/"
+                           << files.size() << ")"
+                           << std::endl;
     }
 
     void SimpleMeshApplication::GL_initialize() {