Fix update removed faces for cutmesh (#1675)

* Fix update removede faces for cutmesh * restore checks
MeshInspector · Oct 9, 2023 · 529a2fa · 529a2fa
1 parent be9079e
commit 529a2fa
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 22 deletions.
diff --git a/source/MRMesh/MRContoursCut.cpp b/source/MRMesh/MRContoursCut.cpp
@@ -1319,28 +1319,47 @@ OneMeshContours convertSurfacePathsToMeshContours( const Mesh& mesh, const std::
 void invalidateFace( MeshTopology& topology, FullRemovedFacesInfo& removedFaceInfo, int contId, int interId, EdgeId leftEdge, size_t oldEdgesSize )
 {
     auto thisFace = topology.left( leftEdge );
-    if ( thisFace.valid() )
+    if ( !thisFace.valid() )
+        return;
+    // fill removed tris
+    auto& removedInfo = removedFaceInfo[contId][interId];
+    removedInfo.f = thisFace;
+    int leftEdgesCount = 0;
+    for ( auto e : leftRing( topology, thisFace ) )
     {
-        // fill removed tris
-        auto& removedInfo = removedFaceInfo[contId][interId];
-        removedInfo.f = thisFace;
-        int leftEdgesCount = 0;
-        for ( auto e : leftRing( topology, thisFace ) )
+        // we don't want to add new edges to this info structure
+        // still they can be present in because of splices done before
+        if ( e < oldEdgesSize )
         {
-            // we don't want to add new edges to this info structure
-            // still they can be present in because of splices done before
-            if ( e < oldEdgesSize )
+            if ( leftEdgesCount > 2 )
             {
-                if ( leftEdgesCount > 2 )
+                assert( false );
+                break;
+            }
+            removedInfo.leftRing[leftEdgesCount] = e;
+            ++leftEdgesCount;
+        }
+    }
+    topology.setLeft( leftEdge, {} );
+}
+
+void iterateFindRemovedFaceInfo( FullRemovedFacesInfo& removedFaces, int contId, int interId, EdgeId leftEdge )
+{
+    for ( int backContId = contId; backContId >= 0; --backContId )
+    {
+        int prevInter = backContId == contId ? ( interId - 1 ) : ( int( removedFaces[backContId].size() ) - 1 );
+        for ( int backInterId = prevInter; backInterId >= 0; --backInterId )
+        {
+            const auto& removedFace = removedFaces[backContId][backInterId];
+            for ( auto e : removedFace.leftRing )
+            {
+                if ( e == leftEdge )
                 {
-                    assert( false );
-                    break;
+                    removedFaces[contId][interId] = removedFace;
+                    return;
                 }
-                removedInfo.leftRing[leftEdgesCount] = e;
-                ++leftEdgesCount;
             }
         }
-        topology.setLeft( leftEdge, {} );
     }
 }
 
@@ -1529,7 +1548,10 @@ PreCutResult doPreCutMesh( Mesh& mesh, const OneMeshContours& contours )
                     .orgEdgeInLeftTri = newEdgeId,
                     .beforeSortIndex = int( edgeData.size() ) } );
                 // fill removed tris
-                removedFacesInfo[intersectionId].f = mesh.topology.left( thisEdge );
+                if ( auto f = mesh.topology.left( thisEdge ) )
+                    removedFacesInfo[intersectionId].f = f;
+                else
+                    iterateFindRemovedFaceInfo( res.removedFaces, contourId, intersectionId, thisEdge );
             }
             // fill removed tris
             if ( inter.primitiveId.index() == OneMeshIntersection::Face )
@@ -1880,7 +1902,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.forceFillMode_ == CutMeshParameters::ForceFill::None && res.fbsWithCountourIntersections.count() > 0 )
+    if ( params.forceFillMode == CutMeshParameters::ForceFill::None && res.fbsWithCountourIntersections.count() > 0 )
         return res;
 
     // find one edge for every hole to fill
@@ -1910,8 +1932,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() || 
-                ( params.forceFillMode_ == CutMeshParameters::ForceFill::Good && 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 );

diff --git a/source/MRMesh/MRContoursCut.h b/source/MRMesh/MRContoursCut.h
@@ -134,7 +134,7 @@ struct CutMeshParameters
         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 };
+    } forceFillMode{ ForceFill::None };
 };
 
 /** \struct MR::CutMeshResult

diff --git a/source/MRMesh/MRToolPath.cpp b/source/MRMesh/MRToolPath.cpp
@@ -242,7 +242,7 @@ ExtractIsolinesResult extractAllIsolines( const Mesh& mesh, const ExtractIsoline
         const auto meshContour = convertMeshTriPointsToClosedContour( mesh, *params.meshTriPoints );
 
         CutMeshParameters cutMeshParams;
-        cutMeshParams.forceFillMode_ = CutMeshParameters::ForceFill::All;
+        cutMeshParams.forceFillMode = CutMeshParameters::ForceFill::All;
         FaceMap new2OldMap;
         cutMeshParams.new2OldMap = &new2OldMap;
         res.old2NewMap.resize( res.meshAfterCut.topology.faceSize() );
@@ -1665,7 +1665,7 @@ FaceBitSet smoothSelection( Mesh& mesh, const FaceBitSet& region, float expandOf
         const auto meshContour = convertMeshTriPointsToClosedContour( mesh, meshTriPoints );
 
         CutMeshParameters cutMeshParams;
-        cutMeshParams.forceFillMode_ = CutMeshParameters::ForceFill::All;
+        cutMeshParams.forceFillMode = CutMeshParameters::ForceFill::All;
         FaceMap new2OldMap;
         cutMeshParams.new2OldMap = &new2OldMap;