More force options in cut mesh (#1527)

* More force options in cut mesh

* Fix comments

* update comments

Author: Grant Karapetyan

source/MRMesh/MRContoursCut.cpp

@@ -1844,7 +1844,7 @@ CutMeshResult cutMesh( Mesh& mesh, const OneMeshContours& contours, const CutMes
     fixOrphans( mesh, preRes.paths, preRes.removedFaces, params.new2OldMap );
 
     res.fbsWithCountourIntersections = getBadFacesAfterCut( mesh.topology, preRes, preRes.removedFaces );
-    if ( !params.forceFillAfterBadCut && res.fbsWithCountourIntersections.count() > 0 )
+    if ( params.forceFillMode_ == CutMeshParameters::ForceFill::None && res.fbsWithCountourIntersections.count() > 0 )
         return res;
 
     // find one edge for every hole to fill
@@ -1874,7 +1874,8 @@ CutMeshResult cutMesh( Mesh& mesh, const OneMeshContours& contours, const CutMes
         for ( int edgeId = 0; edgeId < path.size(); ++edgeId )
         {
             FaceId oldf = preRes.removedFaces[pathId][edgeId].f;
-            if ( !oldf.valid() || res.fbsWithCountourIntersections.test( oldf ) )
+            if ( !oldf.valid() || 
+                ( params.forceFillMode_ == CutMeshParameters::ForceFill::Good && res.fbsWithCountourIntersections.test( oldf ) ) )
                 continue;
             if ( oldEdgesInfo[edgeId].hasLeft && !mesh.topology.left( path[edgeId] ).valid() )
                 addHoleDesc( path[edgeId], oldf );

source/MRMesh/MRContoursCut.h

@@ -121,9 +121,16 @@ struct CutMeshParameters
     const SortIntersectionsData* sortData{nullptr};
     /// This is optional output - map from newly generated faces to old faces (N-1)
     FaceMap* new2OldMap{nullptr};
-    /// If this flag is set, MR::cutMesh will fill all possible triangles, except bad ones; otherwise it will leave deleted faces on all contours line (only in case of bad triangles)
-    /// \note Bad triangles here mean faces where contours have intersections and cannot be cut and filled in an good way
-    bool forceFillAfterBadCut{false};
+    /// This enum defines the MR::cutMesh behaviour in case of bad faces acure
+    /// basicaly MR::cutMesh removes all faces which contours pass through, adds new edges to topology and fills all removed parts
+    /// 
+    /// \note Bad faces here mean faces where contours have intersections and cannot be cut and filled in an good way
+    enum class ForceFill
+    {
+        None, //< if bad faces occur does not fill anything
+        Good, //< fills all faces except bad ones
+        All   //< fills all faces with bad ones, but on bad faces triangulation can also be bad (may have self-intersections or tunnels)
+    } forceFillMode_{ ForceFill::None };
 };
 
 /** \struct MR::CutMeshResult