Skip to content

Add equirectangular camera model in CameraInit #2630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2025
+17 −16
Merged

Add equirectangular camera model in CameraInit #2630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions meshroom/nodes/aliceVision/CameraInit.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading