Skip to content

Commit 48c8f8f

Browse files
cbentejaccbentejac
authored
Merge pull request #2010 from alicevision/dev/updatePipelines
[meshroom] Update experimental pipelines to use ExportImages
2 parents da701bf + 003bbe9 commit 48c8f8f

File tree

4 files changed

+191
-96
lines changed

4 files changed

+191
-96
lines changed

‎meshroom/aliceVision/ExportImages.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class ExportImages(desc.AVCommandLineNode):
100100
label="Undistorted Images",
101101
description="List of undistorted images.",
102102
semantic="image",
103-
value="{nodeCacheFolder}/<VIEW_ID>.{outputFileTypeValue}",
103+
value=lambda attr: getUndistortedPath(attr.node.namingMode.value),
104104
group="",
105105
advanced=True,
106106
),
@@ -111,3 +111,14 @@ class ExportImages(desc.AVCommandLineNode):
111111
value="{nodeCacheFolder}/sfm.abc",
112112
),
113113
]
114+
115+
def getUndistortedPath(namingMode):
116+
117+
replacement = "<FILESTEM>"
118+
if (namingMode == "viewid"):
119+
replacement = "<VIEW_ID>"
120+
elif (namingMode == "frameid"):
121+
replacement = "<FRAME_ID>"
122+
123+
return "{nodeCacheFolder}/" + replacement + ".{outputFileTypeValue}"
124+

‎meshroom/cameraTrackingExperimental.mg‎

Lines changed: 58 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"header": {
3-
"releaseVersion": "2025.1.0",
3+
"releaseVersion": "2026.1.0+develop",
44
"fileVersion": "2.0",
55
"nodesVersions": {
66
"ApplyCalibration": "1.0",
@@ -11,27 +11,27 @@
1111
"DepthMap": "5.0",
1212
"DepthMapFilter": "4.0",
1313
"DistortionCalibration": "6.0",
14-
"ExportAnimatedCamera": "2.0",
14+
"ExportAlembic": "1.0",
1515
"ExportDistortion": "2.0",
16-
"ExportImages": "1.0",
16+
"ExportImages": "1.1",
1717
"FeatureExtraction": "1.3",
1818
"FeatureMatching": "2.0",
1919
"ImageDetectionPrompt": "0.2",
2020
"ImageMatching": "2.0",
2121
"ImageMatchingMultiSfM": "1.0",
2222
"ImageSegmentationBox": "0.3",
23-
"IntrinsicsTransforming": "1.0",
23+
"IntrinsicsTransforming": "1.1",
2424
"KeyframeSelection": "5.0",
2525
"MeshDecimate": "1.0",
2626
"MeshFiltering": "3.0",
2727
"Meshing": "7.0",
28-
"RelativePoseEstimating": "3.0",
28+
"RelativePoseEstimating": "3.1",
2929
"ScenePreview": "2.0",
3030
"SfMBootStrapping": "4.1",
3131
"SfMColorizing": "1.0",
32-
"SfMExpanding": "2.1",
32+
"SfMExpanding": "2.2",
3333
"SfMTransfer": "2.1",
34-
"SfMTransform": "3.1",
34+
"SfMTransform": "3.2",
3535
"SfMTriangulation": "1.0",
3636
"Texturing": "6.0",
3737
"TracksBuilding": "1.0",
@@ -99,7 +99,7 @@
9999
219
100100
],
101101
"inputs": {
102-
"input": "{ExportAnimatedCamera_1.input}",
102+
"input": "{SfMColorizing_2.output}",
103103
"fileExt": "json",
104104
"describerTypes": "{TracksBuilding_2.describerTypes}",
105105
"structure": false,
@@ -109,6 +109,22 @@
109109
"color": "#4c594c"
110110
}
111111
},
112+
"CopyFiles_1": {
113+
"nodeType": "CopyFiles",
114+
"position": [
115+
5079,
116+
119
117+
],
118+
"inputs": {
119+
"inputFiles": [
120+
"{Texturing_1.output}",
121+
"{ScenePreview_1.output}",
122+
"{ExportDistortion_1.output}",
123+
"{ExportAlembic_1.output}",
124+
"{ExportImages_2.output}"
125+
]
126+
}
127+
},
112128
"DepthMapFilter_1": {
113129
"nodeType": "DepthMapFilter",
114130
"position": [
@@ -152,15 +168,14 @@
152168
"color": "#302e2e"
153169
}
154170
},
155-
"ExportAnimatedCamera_1": {
156-
"nodeType": "ExportAnimatedCamera",
171+
"ExportAlembic_1": {
172+
"nodeType": "ExportAlembic",
157173
"position": [
158-
3083,
159-
203
174+
3456,
175+
206
160176
],
161177
"inputs": {
162-
"input": "{SfMColorizing_2.output}",
163-
"exportUndistortedImages": true
178+
"input": "{ExportImages_2.outputSfMData}"
164179
},
165180
"internalInputs": {
166181
"color": "#80766f"
@@ -197,6 +212,21 @@
197212
"color": "#3f3138"
198213
}
199214
},
215+
"ExportImages_2": {
216+
"nodeType": "ExportImages",
217+
"position": [
218+
3250,
219+
194
220+
],
221+
"inputs": {
222+
"input": "{IntrinsicsTransforming_2.input}",
223+
"target": "{IntrinsicsTransforming_2.output}",
224+
"namingMode": "keep"
225+
},
226+
"internalInputs": {
227+
"color": "#80766f"
228+
}
229+
},
200230
"FeatureExtraction_1": {
201231
"nodeType": "FeatureExtraction",
202232
"position": [
@@ -360,6 +390,19 @@
360390
"color": "#3f3138"
361391
}
362392
},
393+
"IntrinsicsTransforming_2": {
394+
"nodeType": "IntrinsicsTransforming",
395+
"position": [
396+
3050,
397+
194
398+
],
399+
"inputs": {
400+
"input": "{SfMColorizing_2.output}"
401+
},
402+
"internalInputs": {
403+
"color": "#80766f"
404+
}
405+
},
363406
"KeyframeSelection_1": {
364407
"nodeType": "KeyframeSelection",
365408
"position": [
@@ -421,21 +464,6 @@
421464
"color": "#3f3138"
422465
}
423466
},
424-
"CopyFiles_1": {
425-
"nodeType": "CopyFiles",
426-
"position": [
427-
5079,
428-
119
429-
],
430-
"inputs": {
431-
"inputFiles": [
432-
"{ExportAnimatedCamera_1.output}",
433-
"{Texturing_1.output}",
434-
"{ScenePreview_1.output}",
435-
"{ExportDistortion_1.output}"
436-
]
437-
}
438-
},
439467
"RelativePoseEstimating_1": {
440468
"nodeType": "RelativePoseEstimating",
441469
"position": [
@@ -462,7 +490,7 @@
462490
"inputs": {
463491
"cameras": "{ConvertSfMFormat_1.output}",
464492
"model": "{MeshDecimate_1.output}",
465-
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
493+
"undistortedImages": "{ExportImages_2.output}",
466494
"masks": "{ImageSegmentationBox_1.output}"
467495
},
468496
"internalInputs": {

‎meshroom/cameraTrackingWithoutCalibrationExperimental.mg‎

Lines changed: 59 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"header": {
3-
"releaseVersion": "2025.1.0",
3+
"releaseVersion": "2026.1.0+develop",
44
"fileVersion": "2.0",
55
"nodesVersions": {
66
"ApplyCalibration": "1.0",
@@ -10,27 +10,27 @@
1010
"CopyFiles": "1.3",
1111
"DepthMap": "5.0",
1212
"DepthMapFilter": "4.0",
13-
"ExportAnimatedCamera": "2.0",
13+
"ExportAlembic": "1.0",
1414
"ExportDistortion": "2.0",
15-
"ExportImages": "1.0",
15+
"ExportImages": "1.1",
1616
"FeatureExtraction": "1.3",
1717
"FeatureMatching": "2.0",
1818
"ImageDetectionPrompt": "0.2",
1919
"ImageMatching": "2.0",
2020
"ImageMatchingMultiSfM": "1.0",
2121
"ImageSegmentationBox": "0.3",
22-
"IntrinsicsTransforming": "1.0",
22+
"IntrinsicsTransforming": "1.1",
2323
"KeyframeSelection": "5.0",
2424
"MeshDecimate": "1.0",
2525
"MeshFiltering": "3.0",
2626
"Meshing": "7.0",
27-
"RelativePoseEstimating": "3.0",
27+
"RelativePoseEstimating": "3.1",
2828
"ScenePreview": "2.0",
2929
"SfMBootStrapping": "4.1",
3030
"SfMColorizing": "1.0",
31-
"SfMExpanding": "2.1",
31+
"SfMExpanding": "2.2",
3232
"SfMTransfer": "2.1",
33-
"SfMTransform": "3.1",
33+
"SfMTransform": "3.2",
3434
"SfMTriangulation": "1.0",
3535
"Texturing": "6.0",
3636
"TracksBuilding": "1.0",
@@ -79,11 +79,11 @@
7979
"ConvertSfMFormat_1": {
8080
"nodeType": "ConvertSfMFormat",
8181
"position": [
82-
4245,
82+
4585,
8383
200
8484
],
8585
"inputs": {
86-
"input": "{ExportAnimatedCamera_1.input}",
86+
"input": "{SfMColorizing_2.output}",
8787
"fileExt": "json",
8888
"describerTypes": "{TracksBuilding_2.describerTypes}",
8989
"structure": false,
@@ -93,6 +93,22 @@
9393
"color": "#4c594c"
9494
}
9595
},
96+
"CopyFiles_1": {
97+
"nodeType": "CopyFiles",
98+
"position": [
99+
5228,
100+
100
101+
],
102+
"inputs": {
103+
"inputFiles": [
104+
"{Texturing_1.output}",
105+
"{ScenePreview_1.output}",
106+
"{ExportDistortion_1.output}",
107+
"{ExportAlembic_1.output}",
108+
"{ExportImages_2.output}"
109+
]
110+
}
111+
},
96112
"DepthMapFilter_1": {
97113
"nodeType": "DepthMapFilter",
98114
"position": [
@@ -122,15 +138,14 @@
122138
"color": "#3f3138"
123139
}
124140
},
125-
"ExportAnimatedCamera_1": {
126-
"nodeType": "ExportAnimatedCamera",
141+
"ExportAlembic_1": {
142+
"nodeType": "ExportAlembic",
127143
"position": [
128-
3216,
129-
198
144+
3465.0,
145+
191.0
130146
],
131147
"inputs": {
132-
"input": "{SfMColorizing_2.output}",
133-
"exportUndistortedImages": true
148+
"input": "{ExportImages_2.outputSfMData}"
134149
},
135150
"internalInputs": {
136151
"color": "#80766f"
@@ -165,6 +180,21 @@
165180
"color": "#3f3138"
166181
}
167182
},
183+
"ExportImages_2": {
184+
"nodeType": "ExportImages",
185+
"position": [
186+
3259.0,
187+
179.0
188+
],
189+
"inputs": {
190+
"input": "{IntrinsicsTransforming_2.input}",
191+
"target": "{IntrinsicsTransforming_2.output}",
192+
"namingMode": "keep"
193+
},
194+
"internalInputs": {
195+
"color": "#80766f"
196+
}
197+
},
168198
"FeatureExtraction_1": {
169199
"nodeType": "FeatureExtraction",
170200
"position": [
@@ -328,6 +358,19 @@
328358
"color": "#3f3138"
329359
}
330360
},
361+
"IntrinsicsTransforming_2": {
362+
"nodeType": "IntrinsicsTransforming",
363+
"position": [
364+
3059.0,
365+
179.0
366+
],
367+
"inputs": {
368+
"input": "{SfMColorizing_2.output}"
369+
},
370+
"internalInputs": {
371+
"color": "#80766f"
372+
}
373+
},
331374
"KeyframeSelection_1": {
332375
"nodeType": "KeyframeSelection",
333376
"position": [
@@ -389,21 +432,6 @@
389432
"color": "#3f3138"
390433
}
391434
},
392-
"CopyFiles_1": {
393-
"nodeType": "CopyFiles",
394-
"position": [
395-
5228,
396-
100
397-
],
398-
"inputs": {
399-
"inputFiles": [
400-
"{ExportAnimatedCamera_1.output}",
401-
"{Texturing_1.output}",
402-
"{ScenePreview_1.output}",
403-
"{ExportDistortion_1.output}"
404-
]
405-
}
406-
},
407435
"RelativePoseEstimating_1": {
408436
"nodeType": "RelativePoseEstimating",
409437
"position": [
@@ -430,7 +458,7 @@
430458
"inputs": {
431459
"cameras": "{ConvertSfMFormat_1.output}",
432460
"model": "{MeshDecimate_1.output}",
433-
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
461+
"undistortedImages": "{ExportImages_2.output}",
434462
"masks": "{ImageSegmentationBox_1.output}"
435463
},
436464
"internalInputs": {

0 commit comments

Comments
 (0)