Merge pull request #2642 from alicevision/dev/sfmLidar

Update sfm pipeline to accept meshes
alicevision · Jan 20, 2025 · 1f42ad3 · 1f42ad3
2 parents 6071a91 + fce6ba1
commit 1f42ad3
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 8 deletions.
diff --git a/meshroom/nodes/aliceVision/ExportMatches.py b/meshroom/nodes/aliceVision/ExportMatches.py
@@ -1,4 +1,4 @@
-__version__ = "1.1"
+__version__ = "2.0"
 
 from meshroom.core import desc
 from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
@@ -50,6 +50,18 @@ class ExportMatches(desc.AVCommandLineNode):
             label="Matches Folders",
             description="Folder(s) in which computed matches are stored.",
         ),
+        desc.File(
+            name="filterA",
+            label="Filter A",
+            description="One item of the pair must match this.",
+            value="",
+        ),
+        desc.File(
+            name="filterB",
+            label="Filter B",
+            description="One item of the pair must match this.",
+            value="",
+        ),
         desc.ChoiceParam(
             name="verboseLevel",
             label="Verbose Level",

diff --git a/meshroom/nodes/aliceVision/RelativePoseEstimating.py b/meshroom/nodes/aliceVision/RelativePoseEstimating.py
@@ -1,4 +1,4 @@
-__version__ = "2.0"
+__version__ = "3.0"
 
 from meshroom.core import desc
 from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
@@ -34,6 +34,22 @@ class RelativePoseEstimating(desc.AVCommandLineNode):
             description="Enforce pure rotation as a model",
             value=False,
         ),
+        desc.IntParam(
+            name="countIterations",
+            label="Ransac Max Iterations",
+            description="Maximal number of iterations.",
+            value=1024,
+            range=(1024, 500000, 1),
+            advanced=True,
+        ),
+        desc.IntParam(
+            name="minInliers",
+            label="Ransac Min Inliers",
+            description="Minimal allowed inliers in two view relationship.",
+            value=35,
+            range=(1, 1000, 1),
+            advanced=True,
+        ),
         desc.ChoiceParam(
             name="verboseLevel",
             label="Verbose Level",

diff --git a/meshroom/nodes/aliceVision/SfmBootstraping.py b/meshroom/nodes/aliceVision/SfmBootstraping.py
@@ -1,7 +1,7 @@
-__version__ = "2.0"
+__version__ = "3.0"
 
 from meshroom.core import desc
-from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
+from meshroom.core.utils import VERBOSE_LEVEL
 
 
 class SfMBootStraping(desc.AVCommandLineNode):
@@ -25,6 +25,12 @@ class SfMBootStraping(desc.AVCommandLineNode):
             description="Tracks file.",
             value="",
         ),
+        desc.File(
+            name="meshFilename",
+            label="Mesh File",
+            description="Mesh file (*.obj).",
+            value="",
+        ),
         desc.File(
             name="pairs",
             label="Pairs File",

diff --git a/meshroom/nodes/aliceVision/SfmExpanding.py b/meshroom/nodes/aliceVision/SfmExpanding.py
@@ -1,7 +1,7 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from meshroom.core import desc
-from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL
+from meshroom.core.utils import VERBOSE_LEVEL
 
 
 class SfMExpanding(desc.AVCommandLineNode):
@@ -28,6 +28,12 @@ class SfMExpanding(desc.AVCommandLineNode):
             description="Tracks file.",
             value="",
         ),
+        desc.File(
+            name="meshFilename",
+            label="Mesh File",
+            description="Mesh file (*.obj).",
+            value="",
+        ),
         desc.IntParam(
             name="localizerEstimatorMaxIterations",
             label="Localizer Max Ransac Iterations",

diff --git a/meshroom/pipelines/nodalCameraTracking.mg b/meshroom/pipelines/nodalCameraTracking.mg
@@ -18,7 +18,7 @@
             "ImageSegmentationBox": "0.1",
             "NodalSfM": "2.0",
             "Publish": "1.3",
-            "RelativePoseEstimating": "2.0",
+            "RelativePoseEstimating": "3.0",
             "ScenePreview": "2.0",
             "TracksBuilding": "1.0"
         }

diff --git a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg
@@ -16,7 +16,7 @@
             "ImageSegmentationBox": "0.1",
             "NodalSfM": "2.0",
             "Publish": "1.3",
-            "RelativePoseEstimating": "2.0",
+            "RelativePoseEstimating": "3.0",
             "ScenePreview": "2.0",
             "TracksBuilding": "1.0"
         }