add camera init type

Fabien Servant · Fabien Servant · commit 17a0d9f9d7d6 · 2024-12-27T12:36:40.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"header": {`
`3`	`3`	`"nodesVersions": {`
`4`		`- "CameraInit": "11.0",`
	`4`	`+ "CameraInit": "12.0",`
`5`	`5`	`"LdrToHdrCalibration": "3.1",`
`6`	`6`	`"LdrToHdrMerge": "4.1",`
`7`	`7`	`"LdrToHdrSampling": "4.0",`