Skip to content

Commit

Permalink
add camera init type
Browse files Browse the repository at this point in the history
  • Loading branch information
servantftechnicolor committed Dec 27, 2024
1 parent aeb77d8 commit 17a0d9f
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 16 deletions.
7 changes: 4 additions & 3 deletions meshroom/nodes/aliceVision/CameraInit.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "11.0"
__version__ = "12.0"

import os
import json
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/cameraTracking.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/cameraTrackingWithoutCalibration.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/distortionCalibration.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/hdrFusion.mg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"header": {
"nodesVersions": {
"CameraInit": "11.0",
"CameraInit": "12.0",
"LdrToHdrCalibration": "3.1",
"LdrToHdrMerge": "4.1",
"LdrToHdrSampling": "4.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/multi-viewPhotometricStereo.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/nodalCameraTracking.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/panoramaFisheyeHdr.mg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"header": {
"nodesVersions": {
"CameraInit": "11.0",
"CameraInit": "12.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/panoramaHdr.mg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"header": {
"nodesVersions": {
"CameraInit": "11.0",
"CameraInit": "12.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photogrammetry.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photogrammetryAndCameraTracking.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photogrammetryDraft.mg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"header": {
"nodesVersions": {
"CameraInit": "11.0",
"CameraInit": "12.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageMatching": "2.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photometricStereo.mg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 17a0d9f

Please sign in to comment.