Merge pull request #2579 from alicevision/dev/nukeExport

[nodes] `ExportDistortion`: Add animated distortion option
alicevision · Dec 23, 2024 · e8d177e · e8d177e
2 parents aeb77d8 + 65cd6dc
commit e8d177e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/meshroom/nodes/aliceVision/ExportDistortion.py b/meshroom/nodes/aliceVision/ExportDistortion.py
@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from meshroom.core import desc
 from meshroom.core.utils import VERBOSE_LEVEL
@@ -27,6 +27,12 @@ class ExportDistortion(desc.AVCommandLineNode):
                         "Only supports 3DEqualizer lens models.",
             value=True,
         ),
+        desc.BoolParam(
+            name="exportAnimatedNukeNode",
+            label="Export Animated Nuke Node",
+            description="Export animated distortion for this sequence as nuke file.",
+            value=False,
+        ),
         desc.BoolParam(
             name="exportLensGridsUndistorted",
             label="Export Lens Grids Undistorted",

diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg
@@ -12,7 +12,7 @@
             "DepthMapFilter": "4.0",
             "DistortionCalibration": "5.0",
             "ExportAnimatedCamera": "2.0",
-            "ExportDistortion": "1.0",
+            "ExportDistortion": "2.0",
             "FeatureExtraction": "1.3",
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",

diff --git a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg
@@ -11,7 +11,7 @@
             "DepthMap": "5.0",
             "DepthMapFilter": "4.0",
             "ExportAnimatedCamera": "2.0",
-            "ExportDistortion": "1.0",
+            "ExportDistortion": "2.0",
             "FeatureExtraction": "1.3",
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",

diff --git a/meshroom/pipelines/distortionCalibration.mg b/meshroom/pipelines/distortionCalibration.mg
@@ -7,7 +7,7 @@
             "CameraInit": "11.0",
             "CheckerboardDetection": "1.0",
             "DistortionCalibration": "5.0",
-            "ExportDistortion": "1.0",
+            "ExportDistortion": "2.0",
             "Publish": "1.3"
         }
     },

diff --git a/meshroom/pipelines/nodalCameraTracking.mg b/meshroom/pipelines/nodalCameraTracking.mg
@@ -10,7 +10,7 @@
             "ConvertSfMFormat": "2.0",
             "DistortionCalibration": "5.0",
             "ExportAnimatedCamera": "2.0",
-            "ExportDistortion": "1.0",
+            "ExportDistortion": "2.0",
             "FeatureExtraction": "1.3",
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",

diff --git a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg
@@ -8,7 +8,7 @@
             "ConvertDistortion": "1.0",
             "ConvertSfMFormat": "2.0",
             "ExportAnimatedCamera": "2.0",
-            "ExportDistortion": "1.0",
+            "ExportDistortion": "2.0",
             "FeatureExtraction": "1.3",
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",

diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg
@@ -12,7 +12,7 @@
             "DepthMapFilter": "4.0",
             "DistortionCalibration": "5.0",
             "ExportAnimatedCamera": "2.0",
-            "ExportDistortion": "1.0",
+            "ExportDistortion": "2.0",
             "FeatureExtraction": "1.3",
             "FeatureMatching": "2.0",
             "ImageDetectionPrompt": "0.1",