diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index 43915693..bc7246ba 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 @@ Intrinsic = [ 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 dbf74029..5291e7b5 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 98a4886b..4a27fe4e 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 f30ab461..cf5a8d13 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 78e518a8..b43017f6 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 5553994b..d1e7a529 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 2e7b6c6b..2d90f10d 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 b67064ab..0e1a055f 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 764b204a..41a85e83 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 4d67f0f3..7c42a282 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 cc6181fd..3908fe54 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 3d324ddc..a9de0ad9 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 6e41617d..28766ad5 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 9a76d737..4fbc39ab 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",