Segment mesh on N face groups

source/MRMesh/MREdgeMetric.cpp

@@ -90,6 +90,23 @@ EdgeMetric edgeAbsCurvMetric( const Mesh & mesh, float angleSinFactor, float ang
     return edgeAbsCurvMetric( mesh.topology, mesh.points, angleSinFactor, angleSinForBoundary );
 }
 
+EdgeMetric edgeDihedralAngleMetric( const MeshTopology& topology, const VertCoords& points, const DihedralAngleProcessParams& params )
+{
+    return [&topology, &points, params]( EdgeId e ) -> float
+    {
+        if ( topology.isBdEdge( e, nullptr ) )
+            return params.boundaryValue;
+
+        auto a = dihedralAngle( topology, points, e );
+        return a >= 0 ? params.convexFactor * a : params.concaveFactor * a;
+    };
+}
+
+EdgeMetric edgeDihedralAngleMetric( const Mesh& mesh, const DihedralAngleProcessParams& params )
+{
+    return edgeDihedralAngleMetric( mesh.topology, mesh.points, params );
+}
+
 EdgeMetric edgeTableSymMetric( const MeshTopology & topology, const EdgeMetric & metric )
 {
     MR_TIMER;

source/MRMesh/MREdgeMetric.h

@@ -44,6 +44,19 @@ namespace MR
 [[nodiscard]] MRMESH_API EdgeMetric edgeAbsCurvMetric( const Mesh & mesh, float angleSinFactor = 2, float angleSinForBoundary = 0 );
 [[nodiscard]] MRMESH_API EdgeMetric edgeAbsCurvMetric( const MeshTopology& topology, const VertCoords& points, float angleSinFactor = 2, float angleSinForBoundary = 0 );
 
+struct DihedralAngleProcessParams
+{
+    float convexFactor = 1;     ///< positive convex dihedral angles are returned multiplied on this factor
+    float concaveFactor = 1;    ///< positive convex dihedral angles are returned multiplied on this factor
+    float boundaryValue = 0;    ///< this value will be returned as dihedral angle for boundary edges
+};
+
+/// this metric returns edge's dihedral angle computed by MR::dihedralAngle and post-processed based on the given parameters;
+/// returned value is NOT multiplied on edge's length as in other metrics;
+/// this metric is symmetric: m(e) == m(e.sym())
+[[nodiscard]] MRMESH_API EdgeMetric edgeDihedralAngleMetric( const Mesh& mesh, const DihedralAngleProcessParams& params = {} );
+[[nodiscard]] MRMESH_API EdgeMetric edgeDihedralAngleMetric( const MeshTopology& topology, const VertCoords& points, const DihedralAngleProcessParams& params = {} );
+
 /// pre-computes the metric for all mesh edges to quickly return it later for any edge;
 /// input metric must be symmetric: metric(e) == metric(e.sym())
 [[nodiscard]] MRMESH_API EdgeMetric edgeTableSymMetric( const MeshTopology & topology, const EdgeMetric & metric );

source/MRMesh/MRGraph.cpp

@@ -5,15 +5,24 @@ namespace MR
 {
 
 void Graph::construct( NeighboursPerVertex neighboursPerVertex, EndsPerEdge endsPerEdge )
+{
+    construct(
+        std::move( neighboursPerVertex ),
+        VertBitSet( neighboursPerVertex.size(), true ),
+        std::move( endsPerEdge ),
+        EdgeBitSet( endsPerEdge.size(), true )
+    );
+}
+
+void Graph::construct( NeighboursPerVertex neighboursPerVertex, VertBitSet validVerts,
+    EndsPerEdge endsPerEdge, EdgeBitSet validEdges )
 {
     MR_TIMER;
 
-    validVerts_.clear();
-    validVerts_.resize( neighboursPerVertex.size(), true );
+    validVerts_ = std::move( validVerts );
     neighboursPerVertex_ = std::move( neighboursPerVertex );
 
-    validEdges_.clear();
-    validEdges_.resize( endsPerEdge.size(), true );
+    validEdges_ = std::move( validEdges );
     endsPerEdge_ = std::move( endsPerEdge );
 
     assert( checkValidity() );

source/MRMesh/MRGraph.h

@@ -48,6 +48,10 @@ class Graph
     /// constructs the graph from all valid vertices and edges
     MRMESH_API void construct( NeighboursPerVertex neighboursPerVertex, EndsPerEdge endsPerEdge );
 
+    /// constructs the graph from given data that can contain invalid vertices and edges
+    MRMESH_API void construct( NeighboursPerVertex neighboursPerVertex, VertBitSet validVerts,
+        EndsPerEdge endsPerEdge, EdgeBitSet validEdges );
+
     /// returns the number of vertex records, including invalid ones
     [[nodiscard]] size_t vertSize() const { return neighboursPerVertex_.size(); }
 

source/MRMesh/MRHeap.h

@@ -28,31 +28,43 @@ class Heap
         T val;
     };
 
+    /// constructs an empty heap
+    Heap( P pred = {} ) : pred_( pred ) {}
+
     /// constructs heap for given number of elements, assigning given default value to each element
     explicit Heap( size_t size, T def MR_LIFETIMEBOUND_NESTED = {}, P pred = {} );
+
     /// constructs heap from given elements (id's shall not repeat and have spaces, but can be arbitrary shuffled)
     explicit Heap( std::vector<Element> elms MR_LIFETIMEBOUND_NESTED, P pred = {} );
+
     /// returns the size of the heap
     size_t size() const { return heap_.size(); }
+
     /// increases the size of the heap by adding elements at the end
     void resize( size_t size, T def MR_LIFETIME_CAPTURE_BY_NESTED(this) = {} );
+
     /// returns the value associated with given element
     const T & value( I elemId ) const MR_LIFETIMEBOUND { return heap_[ id2PosInHeap_[ elemId ] ].val; }
+
     /// returns the element with the largest value
     const Element & top() const MR_LIFETIMEBOUND { return heap_[0]; }
+
     /// sets new value to given element
     void setValue( I elemId, const T & newVal MR_LIFETIME_CAPTURE_BY_NESTED(this) );
+
     /// sets new value to given element, which shall be larger/smaller than the current value
     void setLargerValue( I elemId, const T & newVal MR_LIFETIME_CAPTURE_BY_NESTED(this) );
     void setSmallerValue( I elemId, const T & newVal MR_LIFETIME_CAPTURE_BY_NESTED(this) );
     template<typename U>
     void increaseValue( I elemId, const U & inc ) { setLargerValue( elemId, value( elemId ) + inc ); }
+
     /// sets new value to the current top element, returning its previous value
     Element setTopValue( const T & newVal MR_LIFETIME_CAPTURE_BY_NESTED(this) ) { Element res = top(); setValue( res.id, newVal ); return res; }
 
 private:
     /// tests whether heap element at posA is less than posB
     bool less_( size_t posA, size_t posB ) const;
+
     /// lifts the element in the queue according to its value
     void lift_( size_t pos, I elemId );
 

source/MRMesh/MRMesh.vcxproj

@@ -149,6 +149,7 @@
     <ClInclude Include="MRMeshPatch.h" />
     <ClInclude Include="MRMeshRelax.hpp" />
     <ClInclude Include="MRMeshReplicate.h" />
+    <ClInclude Include="MRSegmentMesh.h" />
     <ClInclude Include="MRMeshSubdivideCallbacks.h" />
     <ClInclude Include="MRMeshThickness.h" />
     <ClInclude Include="MRMeshTopologyDiff.h" />
@@ -465,6 +466,7 @@
     <ClCompile Include="MRMeshDoubleLayer.cpp" />
     <ClCompile Include="MRMeshPatch.cpp" />
     <ClCompile Include="MRMeshSave3mf.cpp" />
+    <ClCompile Include="MRSegmentMesh.cpp" />
     <ClCompile Include="MRMeshTotalAngle.cpp" />
     <ClCompile Include="MRObjectMeshData.cpp" />
     <ClCompile Include="MROneMeshContours.cpp" />

source/MRMesh/MRMesh.vcxproj.filters

@@ -1413,6 +1413,9 @@
     <ClInclude Include="MRMeshTotalAngle.h">
       <Filter>Source Files\MeshAlgorithm</Filter>
     </ClInclude>
+    <ClInclude Include="MRSegmentMesh.h">
+      <Filter>Source Files\Algorithms</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="MRParallelProgressReporter.cpp">
@@ -2321,6 +2324,9 @@
     <ClCompile Include="MRMeshTotalAngle.cpp">
       <Filter>Source Files\MeshAlgorithm</Filter>
     </ClCompile>
+    <ClCompile Include="MRSegmentMesh.cpp">
+      <Filter>Source Files\Algorithms</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\.editorconfig" />