From 17a0d9f9d7d69b15d28135e68bf142b42d44b579 Mon Sep 17 00:00:00 2001 From: Fabien Servant Date: Fri, 27 Dec 2024 12:36:40 +0100 Subject: [PATCH] add camera init type --- meshroom/nodes/aliceVision/CameraInit.py | 7 ++++--- meshroom/pipelines/cameraTracking.mg | 2 +- meshroom/pipelines/cameraTrackingWithoutCalibration.mg | 2 +- meshroom/pipelines/distortionCalibration.mg | 2 +- meshroom/pipelines/hdrFusion.mg | 2 +- meshroom/pipelines/multi-viewPhotometricStereo.mg | 2 +- meshroom/pipelines/nodalCameraTracking.mg | 2 +- .../pipelines/nodalCameraTrackingWithoutCalibration.mg | 2 +- meshroom/pipelines/panoramaFisheyeHdr.mg | 2 +- meshroom/pipelines/panoramaHdr.mg | 2 +- meshroom/pipelines/photogrammetry.mg | 2 +- meshroom/pipelines/photogrammetryAndCameraTracking.mg | 2 +- meshroom/pipelines/photogrammetryDraft.mg | 2 +- meshroom/pipelines/photometricStereo.mg | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index 43915693c6..bc7246ba6a 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -1,4 +1,4 @@ -__version__ = "11.0" +__version__ = "12.0" import os import json @@ -131,9 +131,10 @@ description="Mathematical model used to represent a camera:\n" " - pinhole: Simplest projective camera model without optical distortion " "(focal and optical center).\n" - " - equidistant: Non-projective camera model suited for full-fisheye optics.\n", + " - equidistant: Non-projective camera model suited for full-fisheye optics.\n" + " - equirectangular: Projection model used in panoramas.\n", value="pinhole", - values=["pinhole", "equidistant"], + values=["pinhole", "equidistant", "equirectangular"], ), desc.ChoiceParam( name="distortionType", diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index dbf74029d0..5291e7b548 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -5,7 +5,7 @@ "template": true, "nodesVersions": { "ApplyCalibration": "1.0", - "CameraInit": "11.0", + "CameraInit": "12.0", "CheckerboardDetection": "1.0", "ConvertSfMFormat": "2.0", "DepthMap": "5.0", diff --git a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg index 98a4886b9f..4a27fe4ecc 100644 --- a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg +++ b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg @@ -5,7 +5,7 @@ "template": true, "nodesVersions": { "ApplyCalibration": "1.0", - "CameraInit": "11.0", + "CameraInit": "12.0", "ConvertDistortion": "1.0", "ConvertSfMFormat": "2.0", "DepthMap": "5.0", diff --git a/meshroom/pipelines/distortionCalibration.mg b/meshroom/pipelines/distortionCalibration.mg index f30ab461c6..cf5a8d13b6 100644 --- a/meshroom/pipelines/distortionCalibration.mg +++ b/meshroom/pipelines/distortionCalibration.mg @@ -4,7 +4,7 @@ "fileVersion": "2.0", "template": true, "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "CheckerboardDetection": "1.0", "DistortionCalibration": "5.0", "ExportDistortion": "1.0", diff --git a/meshroom/pipelines/hdrFusion.mg b/meshroom/pipelines/hdrFusion.mg index 78e518a830..b43017f68b 100644 --- a/meshroom/pipelines/hdrFusion.mg +++ b/meshroom/pipelines/hdrFusion.mg @@ -1,7 +1,7 @@ { "header": { "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "LdrToHdrCalibration": "3.1", "LdrToHdrMerge": "4.1", "LdrToHdrSampling": "4.0", diff --git a/meshroom/pipelines/multi-viewPhotometricStereo.mg b/meshroom/pipelines/multi-viewPhotometricStereo.mg index 5553994bbd..d1e7a52947 100644 --- a/meshroom/pipelines/multi-viewPhotometricStereo.mg +++ b/meshroom/pipelines/multi-viewPhotometricStereo.mg @@ -5,7 +5,7 @@ "fileVersion": "2.0", "template": true, "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "DepthMap": "5.0", "DepthMapFilter": "4.0", "FeatureExtraction": "1.3", diff --git a/meshroom/pipelines/nodalCameraTracking.mg b/meshroom/pipelines/nodalCameraTracking.mg index 2e7b6c6b7f..2d90f10ddd 100644 --- a/meshroom/pipelines/nodalCameraTracking.mg +++ b/meshroom/pipelines/nodalCameraTracking.mg @@ -5,7 +5,7 @@ "template": true, "nodesVersions": { "ApplyCalibration": "1.0", - "CameraInit": "11.0", + "CameraInit": "12.0", "CheckerboardDetection": "1.0", "ConvertSfMFormat": "2.0", "DistortionCalibration": "5.0", diff --git a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg index b67064aba8..0e1a055fc4 100644 --- a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg +++ b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg @@ -4,7 +4,7 @@ "fileVersion": "2.0", "template": true, "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "ConvertDistortion": "1.0", "ConvertSfMFormat": "2.0", "ExportAnimatedCamera": "2.0", diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg index 764b204aba..41a85e830e 100644 --- a/meshroom/pipelines/panoramaFisheyeHdr.mg +++ b/meshroom/pipelines/panoramaFisheyeHdr.mg @@ -1,7 +1,7 @@ { "header": { "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "FeatureExtraction": "1.3", "FeatureMatching": "2.0", "ImageMatching": "2.0", diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg index 4d67f0f3fe..7c42a28283 100644 --- a/meshroom/pipelines/panoramaHdr.mg +++ b/meshroom/pipelines/panoramaHdr.mg @@ -1,7 +1,7 @@ { "header": { "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "FeatureExtraction": "1.3", "FeatureMatching": "2.0", "ImageMatching": "2.0", diff --git a/meshroom/pipelines/photogrammetry.mg b/meshroom/pipelines/photogrammetry.mg index cc6181fd40..3908fe5477 100644 --- a/meshroom/pipelines/photogrammetry.mg +++ b/meshroom/pipelines/photogrammetry.mg @@ -4,7 +4,7 @@ "fileVersion": "2.0", "template": true, "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "DepthMap": "5.0", "DepthMapFilter": "4.0", "FeatureExtraction": "1.3", diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index 3d324ddc32..a9de0ad917 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -5,7 +5,7 @@ "template": true, "nodesVersions": { "ApplyCalibration": "1.0", - "CameraInit": "11.0", + "CameraInit": "12.0", "CheckerboardDetection": "1.0", "ConvertSfMFormat": "2.0", "DepthMap": "5.0", diff --git a/meshroom/pipelines/photogrammetryDraft.mg b/meshroom/pipelines/photogrammetryDraft.mg index 6e41617d24..28766ad561 100644 --- a/meshroom/pipelines/photogrammetryDraft.mg +++ b/meshroom/pipelines/photogrammetryDraft.mg @@ -1,7 +1,7 @@ { "header": { "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "FeatureExtraction": "1.3", "FeatureMatching": "2.0", "ImageMatching": "2.0", diff --git a/meshroom/pipelines/photometricStereo.mg b/meshroom/pipelines/photometricStereo.mg index 9a76d73794..4fbc39abbd 100644 --- a/meshroom/pipelines/photometricStereo.mg +++ b/meshroom/pipelines/photometricStereo.mg @@ -4,7 +4,7 @@ "fileVersion": "2.0", "template": true, "nodesVersions": { - "CameraInit": "11.0", + "CameraInit": "12.0", "LightingCalibration": "1.0", "PhotometricStereo": "1.0", "Publish": "1.3",