enh: evaluate-surface-mesh option to set max angle, -fast-collision-t…

…est on/off
Mon-ius · Nov 29, 2020 · a957c42 · a957c42
1 parent 47479c0
commit a957c42
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/Applications/src/evaluate-surface-mesh.cc b/Applications/src/evaluate-surface-mesh.cc
@@ -223,8 +223,10 @@ int main(int argc, char *argv[])
   int         select_comp = 0;
 
   Array<MeshProperty> measures;
-  double              min_frontface_dist = 1e-2;
-  double              min_backface_dist  = 1e-2;
+  double min_frontface_dist  = 1e-2;
+  double min_backface_dist   = 1e-2;
+  double max_collision_angle = 20.0;
+  bool fast_collision_test = false;
 
   double value;
   for (ALL_OPTIONS) {
@@ -295,14 +297,20 @@ int main(int argc, char *argv[])
     }
     else if (OPTION("-collisions") || OPTION("-self-intersections") || OPTION("-coll")) {
       measures.push_back(MESH_Collisions);
+      max_collision_angle = 20.0;
       if (HAS_ARGUMENT) {
         PARSE_ARGUMENT(min_frontface_dist);
-        if (HAS_ARGUMENT) PARSE_ARGUMENT(min_backface_dist);
-        else min_backface_dist = min_frontface_dist;
+        if (HAS_ARGUMENT) {
+          PARSE_ARGUMENT(min_backface_dist);
+          if (HAS_ARGUMENT) PARSE_ARGUMENT(max_collision_angle);
+        } else {
+          min_backface_dist = min_frontface_dist;
+        }
       } else {
         min_frontface_dist = min_backface_dist = 1e-2;
       }
     }
+    else HANDLE_BOOLEAN_OPTION("fast-collision-test", fast_collision_test);
     else HANDLE_COMMON_OR_UNKNOWN_OPTION();
   }
   if (measures.empty()) {
@@ -590,9 +598,10 @@ int main(int argc, char *argv[])
 
         SurfaceCollisions collisions;
         collisions.Input(surface);
+        collisions.FastCollisionTest(fast_collision_test);
         collisions.MinFrontfaceDistance(min_frontface_dist);
         collisions.MinBackfaceDistance(min_backface_dist);
-        collisions.MaxAngle(20.0);
+        collisions.MaxAngle(max_collision_angle);
         collisions.AdjacentIntersectionTestOn();
         collisions.NonAdjacentIntersectionTestOn();
         collisions.FrontfaceCollisionTestOn();