From eb9478c7877ceafeca7dbe5cedcc536003f9b1d9 Mon Sep 17 00:00:00 2001
From: Fabien Servant <fabien.servant@technicolor.com>
Date: Fri, 10 Jan 2025 16:09:47 +0100
Subject: [PATCH] Update sfm pipeline to accept meshes

---
 meshroom/nodes/aliceVision/RelativePoseEstimating.py   | 10 +++++++++-
 meshroom/nodes/aliceVision/SfmBootstraping.py          |  6 ++++++
 meshroom/nodes/aliceVision/SfmExpanding.py             |  6 ++++++
 meshroom/pipelines/nodalCameraTracking.mg              |  2 +-
 .../pipelines/nodalCameraTrackingWithoutCalibration.mg |  2 +-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/meshroom/nodes/aliceVision/RelativePoseEstimating.py b/meshroom/nodes/aliceVision/RelativePoseEstimating.py
index 94254ffaf6..cf231fe538 100644
--- 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,14 @@ 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.ChoiceParam(
             name="verboseLevel",
             label="Verbose Level",
diff --git a/meshroom/nodes/aliceVision/SfmBootstraping.py b/meshroom/nodes/aliceVision/SfmBootstraping.py
index c2eeaefb83..4279ac16a5 100644
--- a/meshroom/nodes/aliceVision/SfmBootstraping.py
+++ b/meshroom/nodes/aliceVision/SfmBootstraping.py
@@ -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
index f96cefed69..d58d1a3008 100644
--- a/meshroom/nodes/aliceVision/SfmExpanding.py
+++ b/meshroom/nodes/aliceVision/SfmExpanding.py
@@ -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
index 2e7b6c6b7f..6468654788 100644
--- 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
index b67064aba8..ba9afc9d30 100644
--- 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"
         }