Merge branch 'master' of https://github.com/MeshInspector/MeshLib into dev

Author: alpinebuster

.github/workflows/build-test-distribute.yml

@@ -336,7 +336,7 @@ jobs:
   collect-stats:
     timeout-minutes: 5
     runs-on: aws-micro
-    needs: [ upload-distributions ]
+    needs: [ config, upload-distributions ]
     if: ${{ always() && needs.config.outputs.internal_build == 'true' }}
     continue-on-error: true
     steps:
@@ -349,6 +349,16 @@ jobs:
           pattern: RunnerSysStats*
           merge-multiple: true
 
+      - uses: aws-actions/configure-aws-credentials@v4
+        id: aws-creds
+        with:
+          aws-region: us-east-1
+          role-to-assume: ${{ secrets.AWS_CI_STAT_API_ROLE_ARN }}
+          output-credentials: true
+
+      - name: Install dependencies
+        run: python3 -m pip install boto3 botocore
+
       - name: Collect stats
         env:
           CI_STATS_AUTH_TOKEN: ${{ secrets.CI_STATS_AUTH_TOKEN }}

.github/workflows/build-test-macos.yml

@@ -120,7 +120,7 @@ jobs:
 
       - name: Run Start-and-Exit Tests
         timeout-minutes: 3
-        run: MR_LOCAL_RESOURCES=1 ./build/${{ matrix.config }}/bin/MeshViewer -tryHidden -noEventLoop -unloadPluginsAtEnd
+        run: MR_LOCAL_RESOURCES=1 ./build/${{ matrix.config }}/bin/MeshViewer.app/Contents/MacOS/MeshViewer -tryHidden -noEventLoop -unloadPluginsAtEnd
 
       - name: Unit Tests
         run: ./build/${{ matrix.config }}/bin/MRTest

examples/python-examples/MeshOffsetWeighted.dox.py

@@ -15,7 +15,7 @@
 
 # ===params
 
-params = mrmeshpy.WeightedPointsShellParametersMetric()
+params = mrmeshpy.WeightedShell.ParametersMetric()
 # Algorithm is voxel based, voxel size affects performance and form of result mesh
 params.voxelSize = mrmeshpy.suggestVoxelSize(mesh, 10000)
 # common basic offset applied for all point
@@ -24,6 +24,6 @@
 params.dist.maxWeight = max(scalars.vec) # should always have maximum between weights provided
 
 # ===offset
-res = mrmeshpy.weightedMeshShell(mesh, scalars, params)
+res = mrmeshpy.WeightedShell.meshShell(mesh, scalars, params)
 
 mrmeshpy.saveMesh(res, "offset_weighted.ctm")

scripts/devops/collect_ci_stats.py

@@ -6,8 +6,13 @@
 from pathlib import Path
 from typing import List
 
+import boto3
+from botocore.auth import SigV4Auth
+from botocore.awsrequest import AWSRequest
 import requests
 
+API_URL = "https://api.meshinspector.com/ci-stats/v2/log"
+
 def parse_iso8601(s):
     return datetime.datetime.strptime(s, '%Y-%m-%dT%H:%M:%S%z')
 
@@ -76,6 +81,23 @@ def fetch_jobs(repo: str, run_id: str):
         'X-GitHub-Api-Version': '2022-11-28',
     })
 
+def sign_api_request(url, method, headers, body, region, service):
+    # Use the credentials from the assumed role
+    session = boto3.Session()
+    credentials = session.get_credentials().get_frozen_credentials()
+
+    request = AWSRequest(
+        method=method,
+        url=url,
+        headers=headers,
+        data=json.dumps(body)
+    )
+
+    # Sign the request with the SigV4Auth class
+    SigV4Auth(credentials, service, region).add_auth(request)
+
+    return request
+
 if __name__ == "__main__":
     branch = os.environ.get('GIT_BRANCH')
     commit = os.environ.get('GIT_COMMIT')
@@ -95,8 +117,29 @@ def fetch_jobs(repo: str, run_id: str):
     }
     pprint.pp(result, indent=2, width=150)
 
-    resp = requests.post("https://api.meshinspector.com/ci-stats/v1/log", json=result, headers={
-        'Authorization': f'Bearer {os.environ.get("CI_STATS_AUTH_TOKEN")}',
-    })
-    if resp.status_code != 200:
-        raise RuntimeError(f'{resp.status_code}: {resp.text}')
+    headers = {
+        'Content-Type': 'application/json',
+    }
+
+    if os.environ.get("CI_STATS_AUTH_TOKEN"):
+        headers['Authorization'] = f'Bearer {os.environ.get("CI_STATS_AUTH_TOKEN")}'
+
+    signed_request = sign_api_request(
+        API_URL,
+        'POST',
+        headers,
+        result,
+        'us-east-1',
+        'execute-api' # Service name for API Gateway
+    )
+
+    response = requests.post(
+        API_URL,
+        headers=dict(signed_request.headers.items()),  # Use signed headers
+        data=signed_request.body
+    )
+
+    if response.status_code == 200:
+        print("Successfully sent the CI stats to the API")
+    else:
+        raise RuntimeError(f'{response.status_code}: {response.text}')

source/MRMesh/MRBooleanOperation.cpp

@@ -111,8 +111,7 @@ bool preparePart( const Mesh& origin, std::vector<EdgePath>& cutPaths, Mesh& out
     auto compsMap = MeshComponents::getAllComponentsMap( origin );
     leftPart = preparePart( origin, compsMap, leftPart, otherMesh, needInsidePart, originIsA, rigidB2A, mergeAllNonIntersectingComponents, intParams );
 
-    outMesh.addMeshPart( { origin, &leftPart }, needFlip, {}, {},
-        HashToVectorMappingConverter( origin.topology, fMapPtr, vMapPtr, eMapPtr ).getPartMapping() );
+    outMesh.addMeshPart( { origin, &leftPart }, needFlip, {}, {}, Src2TgtMaps( fMapPtr, vMapPtr, eMapPtr ) );
 
     for ( auto& path : cutPaths )
         for ( auto& e : path )
@@ -145,11 +144,9 @@ void connectPreparedParts( Mesh& partA, Mesh& partB, bool pathsHaveLeftHole,
     else
     {
         if ( !pathsHaveLeftHole )
-            partA.addMeshPart( partB, false, pathsA, pathsB,
-                HashToVectorMappingConverter( partB.topology, fMapNewPtr, vMapNewPtr, eMapNewPtr ).getPartMapping() );
+            partA.addMeshPart( partB, false, pathsA, pathsB, Src2TgtMaps( fMapNewPtr, vMapNewPtr, eMapNewPtr ) );
         else
-            partB.addMeshPart( partA, false, pathsB, pathsA,
-                HashToVectorMappingConverter( partA.topology, fMapNewPtr, vMapNewPtr, eMapNewPtr ).getPartMapping() );
+            partB.addMeshPart( partA, false, pathsB, pathsA, Src2TgtMaps( fMapNewPtr, vMapNewPtr, eMapNewPtr ) );
     }
 
     if ( mapper )
@@ -197,24 +194,24 @@ Mesh doTrivialBooleanOperation( Mesh&& meshACut, Mesh&& meshBCut, BooleanOperati
         bPartFbs = preparePart( meshBCut, bComponentsMap, {}, meshACut, true, false, rigidB2A, mergeAllNonIntersectingComponents, intParams );
     taskGroup.wait();
 
-    if ( aPartFbs.count() != 0 )
+    if ( aPartFbs.any() )
     {
         FaceMap* fMapPtr = mapper ? &mapper->maps[int( BooleanResultMapper::MapObject::A )].cut2newFaces : nullptr;
         WholeEdgeMap* eMapPtr = mapper ? &mapper->maps[int( BooleanResultMapper::MapObject::A )].old2newEdges : nullptr;
         VertMap* vMapPtr = mapper ? &mapper->maps[int( BooleanResultMapper::MapObject::A )].old2newVerts : nullptr;
 
         aPart.addMeshPart( { meshACut, &aPartFbs }, operation == BooleanOperation::DifferenceBA,
-                             {}, {}, HashToVectorMappingConverter( meshACut.topology, fMapPtr, vMapPtr, eMapPtr ).getPartMapping() );
+                             {}, {}, Src2TgtMaps( fMapPtr, vMapPtr, eMapPtr ) );
     }
 
-    if ( bPartFbs.count() != 0 )
+    if ( bPartFbs.any() )
     {
         FaceMap* fMapPtr = mapper ? &mapper->maps[int( BooleanResultMapper::MapObject::B )].cut2newFaces : nullptr;
         WholeEdgeMap* eMapPtr = mapper ? &mapper->maps[int( BooleanResultMapper::MapObject::B )].old2newEdges : nullptr;
         VertMap* vMapPtr = mapper ? &mapper->maps[int( BooleanResultMapper::MapObject::B )].old2newVerts : nullptr;
 
         bPart.addMeshPart( { meshBCut, &bPartFbs }, operation == BooleanOperation::DifferenceAB,
-                             {}, {}, HashToVectorMappingConverter( meshBCut.topology, fMapPtr, vMapPtr, eMapPtr ).getPartMapping() );
+                             {}, {}, Src2TgtMaps( fMapPtr, vMapPtr, eMapPtr ) );
     }
 
     connectPreparedParts( aPart, bPart, false, {}, {}, rigidB2A, mapper );

source/MRMesh/MRChangeXfAction.h

@@ -12,14 +12,24 @@ namespace MR
 class ChangeXfAction : public HistoryAction
 {
 public:
-    /// Constructed from original obj
+    /// use this constructor to remember object's transformation before making any changes in it
     ChangeXfAction( const std::string& name, const std::shared_ptr<Object>& obj ) :
         obj_{ obj },
         xf_{ obj->xf() },
         name_{ name }
     {
     }
 
+    /// use this constructor to remember object's transformation and immediately set new mesh
+    ChangeXfAction( const std::string& name, const std::shared_ptr<Object>& obj, const AffineXf3f& newXf ) :
+        obj_{ obj },
+        xf_{ obj->xf() },
+        name_{ name }
+    {
+        if ( obj_ )
+            obj_->setXf( newXf );
+    }
+
     virtual std::string name() const override
     {
         return name_;
@@ -39,10 +49,15 @@ class ChangeXfAction : public HistoryAction
         return name_.capacity();
     }
 
+    const std::shared_ptr<Object> & obj() const
+    {
+        return obj_;
+    }
+
 private:
     std::shared_ptr<Object> obj_;
     AffineXf3f xf_;
     std::string name_;
 };
 
-}
+} //namespace MR

source/MRMesh/MRClosestWeightedPoint.cpp

@@ -163,12 +163,13 @@ MeshPointAndDistance findClosestWeightedMeshPoint( const Vector3f& loc,
         const auto mtp = MeshTriPoint{ mesh.topology.edgeWithLeft( f ), c->tp };
         const MeshPointAndDistance candidate
         {
+            .loc = loc,
             .mtp = mtp,
             .eucledeanDist = distance( loc, c->pos ),
             .w = c->w,
             .bidirectionalOrOutside = params.bidirectionalMode || dot( mesh.pseudonormal( mtp ), loc - c->pos ) >= 0
         };
-        if ( candidate.innerDist() < res.innerDist() )
+        if ( candidate < res )
         {
             assert( candidate.bidirDist() < params.maxBidirDist );
             res = candidate;

source/MRMesh/MRClosestWeightedPoint.h

@@ -23,7 +23,10 @@ struct PointAndDistance
 
 struct MeshPointAndDistance
 {
-    /// a point on mesh in barycentric representation
+    /// point location
+    Vector3f loc;
+
+    /// the corresponding point on mesh in barycentric representation
     MeshTriPoint mtp;
 
     /// euclidean distance from input location to mtp
@@ -35,6 +38,7 @@ struct MeshPointAndDistance
     /// either
     /// 1) bidirectional distances are computed, or
     /// 2) input location is locally outside of the surface (by pseudonormal)
+    /// used for optimization
     bool bidirectionalOrOutside = true;
 
     /// bidirectional distance from input location to mtp considering point's weight
@@ -51,11 +55,15 @@ struct MeshPointAndDistance
         return ( bidirectionalOrOutside ? eucledeanDist : -eucledeanDist ) - w;
     }
 
-    /// this distance is used internally to find the best surface point, which has the smallest inner distance;
-    /// innerDist() grows in both directions of the surface unlike weightedDist()
-    [[nodiscard]] float innerDist() const
+    /// comparison telling which point is closer to the location
+    auto operator <=> ( const MeshPointAndDistance& other ) const
     {
-        return eucledeanDist + ( bidirectionalOrOutside ? -w : w );
+        if ( bidirectionalOrOutside && other.bidirectionalOrOutside  )
+            return eucledeanDist - w <=> other.eucledeanDist - other.w;
+        if ( bidirectionalOrOutside != other.bidirectionalOrOutside )
+            return eucledeanDist <=> other.eucledeanDist;
+        return eucledeanDist + ( bidirectionalOrOutside ? -w : w ) <=>
+                other.eucledeanDist + ( other.bidirectionalOrOutside ? -other.w : other.w );
     }
 
     /// check for validity, otherwise there is no point closer than maxBidirDist

source/MRMesh/MRContoursCut.cpp

@@ -70,14 +70,6 @@ struct PreCutResult
     std::vector<std::vector<PathsEdgeIndex>> oldEdgesInfo;
 };
 
-bool isClosed( const ContinuousContour& contour )
-{
-    return contour.size() > 1 &&
-        contour.front().isEdgeATriB == contour.back().isEdgeATriB &&
-        contour.front().edge.undirected() == contour.back().edge.undirected() &&
-        contour.front().tri == contour.back().tri;
-}
-
 enum class TrianglesSortRes
 {
     Undetermined, // triangles positions cannot be determined
@@ -2167,7 +2159,7 @@ CutMeshResult cutMesh( Mesh& mesh, const OneMeshContours& contours, const CutMes
     fixOrphans( mesh, preRes.paths, preRes.removedFaces, params.new2OldMap, params.new2oldEdgesMap );
 
     res.fbsWithContourIntersections = getBadFacesAfterCut( mesh.topology, preRes, preRes.removedFaces );
-    if ( params.forceFillMode == CutMeshParameters::ForceFill::None && res.fbsWithContourIntersections.count() > 0 )
+    if ( params.forceFillMode == CutMeshParameters::ForceFill::None && res.fbsWithContourIntersections.any() )
         return res;
 
     // find one edge for every hole to fill

source/MRMesh/MRFixSelfIntersections.cpp

@@ -230,17 +230,22 @@ Expected<void> fix( Mesh& mesh, const Settings& settings )
 // Helper function to find own self-intersections on a mesh part
 static Expected<FaceBitSet> findSelfCollidingTrianglesBSForPart( Mesh& mesh, const FaceBitSet& part, ProgressCallback cb, bool touchIsIntersection )
 {
-    FaceMap tgt2srcFaceMap;
+    FaceMapOrHashMap tgt2srcFaces;
     PartMapping mapping;
-    mapping.tgt2srcFaceMap = &tgt2srcFaceMap;
+    mapping.tgt2srcFaces = &tgt2srcFaces;
     Mesh partMesh = mesh.cloneRegion( part, false, mapping );
     // Faster than searching in mesh part due to AABB tree rebuild
     auto res = findSelfCollidingTrianglesBS( { partMesh }, cb, nullptr, touchIsIntersection );
     if ( !res.has_value() )
         return unexpected( res.error() );
     FaceBitSet result( mesh.topology.lastValidFace() + 1 );
-    for ( FaceId f : *res )
-        result.set( tgt2srcFaceMap[f] );
+    if ( auto map = tgt2srcFaces.getMap() )
+    {
+        for ( FaceId f : *res )
+            result.set( (*map)[f] );
+    }
+    else
+        assert( false );
     return result;
 }