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 81c7668b4b..6fcf26ae85 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 42fd43c549..b34a7b9f2b 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 f3589277fb..226e911e5b 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": "2.0", diff --git a/meshroom/pipelines/hdrFusion.mg b/meshroom/pipelines/hdrFusion.mg index fb38ea2b73..b3d70333d8 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 5a87ee7016..c19d53f354 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 740492618f..793a1d6e10 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 ab99676f02..904db5a966 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 d796195728..03daf308d2 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 f3184cf19f..566c126d15 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 54e615fb0a..8290fbb384 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 c52aa0b637..aa32aa9770 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 50a494c018..ace6962fa1 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 6bf2faa8e0..07f5f8c37d 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",