Skip to content

Commit e037371

Browse files
demoulinvdemoulinv
committed
[pipelines] Updates tracking pipelines
1 parent 88f9d4b commit e037371

File tree

4 files changed

+109
-147
lines changed

4 files changed

+109
-147
lines changed

‎meshroom/pipelines/cameraTracking.mg‎

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"ExportDistortion": "1.0",
1616
"FeatureExtraction": "1.3",
1717
"FeatureMatching": "2.0",
18+
"ImageDetectionPrompt": "0.1",
1819
"ImageMatching": "2.0",
1920
"ImageMatchingMultiSfM": "1.0",
20-
"ImageSegmentationPrompt": "0.1",
21+
"ImageSegmentationBox": "0.1",
2122
"KeyframeSelection": "5.0",
2223
"MeshDecimate": "1.0",
2324
"MeshFiltering": "3.0",
2425
"Meshing": "7.0",
2526
"PrepareDenseScene": "3.1",
26-
"Publish": "1.3",
2727
"ScenePreview": "2.0",
2828
"SfMTransfer": "2.1",
2929
"SfMTriangulation": "1.0",
@@ -174,12 +174,12 @@
174174
"FeatureExtraction_1": {
175175
"nodeType": "FeatureExtraction",
176176
"position": [
177-
200,
178-
200
177+
393,
178+
231
179179
],
180180
"inputs": {
181181
"input": "{ApplyCalibration_1.output}",
182-
"masksFolder": "{ImageSegmentationPrompt_1.output}",
182+
"masksFolder": "{ImageSegmentationBox_1.output}",
183183
"maskExtension": "exr"
184184
},
185185
"internalInputs": {
@@ -236,6 +236,16 @@
236236
"color": "#80766f"
237237
}
238238
},
239+
"ImageDetectionPrompt_1": {
240+
"nodeType": "ImageDetectionPrompt",
241+
"position": [
242+
-4,
243+
227
244+
],
245+
"inputs": {
246+
"input": "{CameraInit_1.output}"
247+
}
248+
},
239249
"ImageMatchingMultiSfM_1": {
240250
"nodeType": "ImageMatchingMultiSfM",
241251
"position": [
@@ -292,19 +302,17 @@
292302
"color": "#80766f"
293303
}
294304
},
295-
"ImageSegmentationPrompt_1": {
296-
"nodeType": "ImageSegmentationPrompt",
305+
"ImageSegmentationBox_1": {
306+
"nodeType": "ImageSegmentationBox",
297307
"position": [
298-
0,
299-
200
308+
194,
309+
319
300310
],
301311
"inputs": {
302-
"input": "{CameraInit_1.output}",
312+
"input": "{ImageDetectionPrompt_1.input}",
313+
"bboxFolder": "{ImageDetectionPrompt_1.output}",
303314
"maskInvert": true,
304315
"keepFilename": true
305-
},
306-
"internalInputs": {
307-
"color": "#575963"
308316
}
309317
},
310318
"KeyframeSelection_1": {
@@ -316,9 +324,6 @@
316324
"inputs": {
317325
"inputPaths": [
318326
"{ApplyCalibration_1.output}"
319-
],
320-
"maskPaths": [
321-
"{ImageSegmentationPrompt_1.output}"
322327
]
323328
},
324329
"internalInputs": {
@@ -379,30 +384,12 @@
379384
],
380385
"inputs": {
381386
"input": "{SfMTriangulation_1.output}",
382-
"masksFolders": [
383-
"{ImageSegmentationPrompt_1.output}"
384-
],
385387
"maskExtension": "exr"
386388
},
387389
"internalInputs": {
388390
"color": "#3f3138"
389391
}
390392
},
391-
"Publish_1": {
392-
"nodeType": "Publish",
393-
"position": [
394-
3574,
395-
166
396-
],
397-
"inputs": {
398-
"inputFiles": [
399-
"{ExportAnimatedCamera_1.output}",
400-
"{Texturing_1.output}",
401-
"{ScenePreview_1.output}",
402-
"{ExportDistortion_1.output}"
403-
]
404-
}
405-
},
406393
"ScenePreview_1": {
407394
"nodeType": "ScenePreview",
408395
"position": [
@@ -413,7 +400,7 @@
413400
"cameras": "{ConvertSfMFormat_1.output}",
414401
"model": "{MeshDecimate_1.output}",
415402
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
416-
"masks": "{ImageSegmentationPrompt_1.output}"
403+
"masks": "{ImageSegmentationBox_1.output}"
417404
},
418405
"internalInputs": {
419406
"color": "#4c594c"

‎meshroom/pipelines/cameraTrackingWithoutCalibration.mg‎

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
"ExportDistortion": "1.0",
1515
"FeatureExtraction": "1.3",
1616
"FeatureMatching": "2.0",
17+
"ImageDetectionPrompt": "0.1",
1718
"ImageMatching": "2.0",
1819
"ImageMatchingMultiSfM": "1.0",
19-
"ImageSegmentationPrompt": "0.1",
20+
"ImageSegmentationBox": "0.1",
2021
"KeyframeSelection": "5.0",
2122
"MeshDecimate": "1.0",
2223
"MeshFiltering": "3.0",
2324
"Meshing": "7.0",
2425
"PrepareDenseScene": "3.1",
25-
"Publish": "1.3",
2626
"ScenePreview": "2.0",
2727
"SfMTransfer": "2.1",
2828
"SfMTriangulation": "1.0",
@@ -145,12 +145,12 @@
145145
"FeatureExtraction_1": {
146146
"nodeType": "FeatureExtraction",
147147
"position": [
148-
200,
149-
200
148+
451,
149+
261
150150
],
151151
"inputs": {
152152
"input": "{ApplyCalibration_1.output}",
153-
"masksFolder": "{ImageSegmentationPrompt_1.output}",
153+
"masksFolder": "{ImageSegmentationBox_1.output}",
154154
"maskExtension": "exr"
155155
},
156156
"internalInputs": {
@@ -207,6 +207,16 @@
207207
"color": "#80766f"
208208
}
209209
},
210+
"ImageDetectionPrompt_1": {
211+
"nodeType": "ImageDetectionPrompt",
212+
"position": [
213+
27,
214+
261
215+
],
216+
"inputs": {
217+
"input": "{CameraInit_1.output}"
218+
}
219+
},
210220
"ImageMatchingMultiSfM_1": {
211221
"nodeType": "ImageMatchingMultiSfM",
212222
"position": [
@@ -263,19 +273,17 @@
263273
"color": "#80766f"
264274
}
265275
},
266-
"ImageSegmentationPrompt_1": {
267-
"nodeType": "ImageSegmentationPrompt",
276+
"ImageSegmentationBox_1": {
277+
"nodeType": "ImageSegmentationBox",
268278
"position": [
269-
0,
270-
200
279+
233,
280+
369
271281
],
272282
"inputs": {
273-
"input": "{CameraInit_1.output}",
283+
"input": "{ImageDetectionPrompt_1.input}",
284+
"bboxFolder": "{ImageDetectionPrompt_1.output}",
274285
"maskInvert": true,
275286
"keepFilename": true
276-
},
277-
"internalInputs": {
278-
"color": "#575963"
279287
}
280288
},
281289
"KeyframeSelection_1": {
@@ -287,9 +295,6 @@
287295
"inputs": {
288296
"inputPaths": [
289297
"{ApplyCalibration_1.output}"
290-
],
291-
"maskPaths": [
292-
"{ImageSegmentationPrompt_1.output}"
293298
]
294299
},
295300
"internalInputs": {
@@ -350,30 +355,12 @@
350355
],
351356
"inputs": {
352357
"input": "{SfMTriangulation_1.output}",
353-
"masksFolders": [
354-
"{ImageSegmentationPrompt_1.output}"
355-
],
356358
"maskExtension": "exr"
357359
},
358360
"internalInputs": {
359361
"color": "#3f3138"
360362
}
361363
},
362-
"Publish_1": {
363-
"nodeType": "Publish",
364-
"position": [
365-
3574,
366-
166
367-
],
368-
"inputs": {
369-
"inputFiles": [
370-
"{ExportAnimatedCamera_1.output}",
371-
"{Texturing_1.output}",
372-
"{ScenePreview_1.output}",
373-
"{ExportDistortion_1.output}"
374-
]
375-
}
376-
},
377364
"ScenePreview_1": {
378365
"nodeType": "ScenePreview",
379366
"position": [
@@ -384,7 +371,7 @@
384371
"cameras": "{ConvertSfMFormat_1.output}",
385372
"model": "{MeshDecimate_1.output}",
386373
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
387-
"masks": "{ImageSegmentationPrompt_1.output}"
374+
"masks": "{ImageSegmentationBox_1.output}"
388375
},
389376
"internalInputs": {
390377
"color": "#4c594c"

0 commit comments

Comments
 (0)