[pipelines] Updates tracking pipelines with new segmentation nodes

The segmentation process is now split into two nodes:
`ImageDetectionPrompt` and `ImageSegmentationBox`, which replace the
`ImageSegmentationPrompt` in the camera tracking templates.

All the nodes in the templates are also correctly realigned.
This commit is contained in:
Candice Bentéjac 2024-10-28 15:15:46 +00:00
parent 88f9d4be39
commit 66d25941f5
5 changed files with 163 additions and 105 deletions

View file

@ -15,9 +15,10 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
@ -174,12 +175,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
200
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}",
"masksFolder": "{ImageSegmentationBox_1.output}",
"maskExtension": "exr"
},
"internalInputs": {
@ -236,6 +237,19 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
@ -292,14 +306,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
@ -316,9 +331,6 @@
"inputs": {
"inputPaths": [
"{ApplyCalibration_1.output}"
],
"maskPaths": [
"{ImageSegmentationPrompt_1.output}"
]
},
"internalInputs": {
@ -379,9 +391,6 @@
],
"inputs": {
"input": "{SfMTriangulation_1.output}",
"masksFolders": [
"{ImageSegmentationPrompt_1.output}"
],
"maskExtension": "exr"
},
"internalInputs": {
@ -391,8 +400,8 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
3600,
100
],
"inputs": {
"inputFiles": [
@ -413,7 +422,7 @@
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}"
"masks": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#4c594c"

View file

@ -14,9 +14,10 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
@ -145,12 +146,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
200
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}",
"masksFolder": "{ImageSegmentationBox_1.output}",
"maskExtension": "exr"
},
"internalInputs": {
@ -207,6 +208,19 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
@ -263,14 +277,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
@ -287,9 +302,6 @@
"inputs": {
"inputPaths": [
"{ApplyCalibration_1.output}"
],
"maskPaths": [
"{ImageSegmentationPrompt_1.output}"
]
},
"internalInputs": {
@ -350,9 +362,6 @@
],
"inputs": {
"input": "{SfMTriangulation_1.output}",
"masksFolders": [
"{ImageSegmentationPrompt_1.output}"
],
"maskExtension": "exr"
},
"internalInputs": {
@ -362,8 +371,8 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
3574,
166
3600,
100
],
"inputs": {
"inputFiles": [
@ -384,7 +393,7 @@
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}"
"masks": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#4c594c"

View file

@ -13,8 +13,9 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"NodalSfM": "2.0",
"Publish": "1.3",
"RelativePoseEstimating": "2.0",
@ -78,7 +79,7 @@
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1400,
1600,
200
],
"inputs": {
@ -108,7 +109,7 @@
"ExportAnimatedCamera_1": {
"nodeType": "ExportAnimatedCamera",
"position": [
1400,
1600,
0
],
"inputs": {
@ -135,12 +136,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
0
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}"
"masksFolder": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#80766f"
@ -149,7 +150,7 @@
"FeatureMatching_1": {
"nodeType": "FeatureMatching",
"position": [
600,
800,
0
],
"inputs": {
@ -162,10 +163,23 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#80766f"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
400,
600,
0
],
"inputs": {
@ -178,14 +192,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
@ -196,7 +211,7 @@
"NodalSfM_1": {
"nodeType": "NodalSfM",
"position": [
1200,
1400,
0
],
"inputs": {
@ -211,7 +226,7 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
1800,
2000,
0
],
"inputs": {
@ -225,7 +240,7 @@
"RelativePoseEstimating_1": {
"nodeType": "RelativePoseEstimating",
"position": [
1000,
1200,
0
],
"inputs": {
@ -240,14 +255,14 @@
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
1600,
1800,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{NodalSfM_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}",
"masks": "{ImageSegmentationBox_1.output}",
"pointCloudParams": {
"particleSize": 0.001,
"particleColor": "Red"
@ -260,7 +275,7 @@
"TracksBuilding_1": {
"nodeType": "TracksBuilding",
"position": [
800,
1000,
0
],
"inputs": {

View file

@ -11,8 +11,9 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"NodalSfM": "2.0",
"Publish": "1.3",
"RelativePoseEstimating": "2.0",
@ -24,7 +25,7 @@
"CameraInit_1": {
"nodeType": "CameraInit",
"position": [
-200,
-400,
0
],
"inputs": {},
@ -96,8 +97,8 @@
0
],
"inputs": {
"input": "{ImageSegmentationPrompt_1.input}",
"masksFolder": "{ImageSegmentationPrompt_1.output}"
"input": "{ImageSegmentationBox_1.input}",
"masksFolder": "{ImageSegmentationBox_1.output}"
},
"internalInputs": {
"color": "#80766f"
@ -119,6 +120,19 @@
"color": "#80766f"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
-200,
0
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#80766f"
}
},
"ImageMatching_1": {
"nodeType": "ImageMatching",
"position": [
@ -135,14 +149,15 @@
"color": "#80766f"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_1": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
0
],
"inputs": {
"input": "{CameraInit_1.output}",
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}",
"maskInvert": true,
"keepFilename": true
},
@ -168,8 +183,8 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
2000,
0
2100,
100
],
"inputs": {
"inputFiles": [
@ -204,7 +219,7 @@
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{NodalSfM_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}",
"masks": "{ImageSegmentationBox_1.output}",
"pointCloudParams": {
"particleSize": 0.001,
"particleColor": "Red"

View file

@ -15,9 +15,10 @@
"ExportDistortion": "1.0",
"FeatureExtraction": "1.3",
"FeatureMatching": "2.0",
"ImageDetectionPrompt": "0.1",
"ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0",
"ImageSegmentationPrompt": "0.1",
"ImageSegmentationBox": "0.1",
"KeyframeSelection": "5.0",
"MeshDecimate": "1.0",
"MeshFiltering": "3.0",
@ -71,8 +72,8 @@
"CameraInit_3": {
"nodeType": "CameraInit",
"position": [
-594,
-584
-600,
-500
],
"inputs": {},
"internalInputs": {
@ -98,8 +99,8 @@
"ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat",
"position": [
1948,
211
2000,
200
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}",
@ -115,8 +116,8 @@
"DepthMapFilter_2": {
"nodeType": "DepthMapFilter",
"position": [
806,
-584
800,
-500
],
"inputs": {
"input": "{DepthMap_2.input}",
@ -129,8 +130,8 @@
"DepthMap_2": {
"nodeType": "DepthMap",
"position": [
606,
-584
600,
-500
],
"inputs": {
"input": "{PrepareDenseScene_2.input}",
@ -185,12 +186,12 @@
"FeatureExtraction_1": {
"nodeType": "FeatureExtraction",
"position": [
200,
400,
200
],
"inputs": {
"input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentationPrompt_1.output}",
"masksFolder": "{ImageSegmentationBox_2.output}",
"maskExtension": "exr"
},
"internalInputs": {
@ -200,8 +201,8 @@
"FeatureExtraction_2": {
"nodeType": "FeatureExtraction",
"position": [
-394,
-584
-400,
-500
],
"inputs": {
"input": "{CameraInit_3.output}"
@ -263,8 +264,8 @@
"FeatureMatching_4": {
"nodeType": "FeatureMatching",
"position": [
6,
-584
0,
-500
],
"inputs": {
"input": "{ImageMatching_3.input}",
@ -279,7 +280,7 @@
"FeatureMatching_5": {
"nodeType": "FeatureMatching",
"position": [
607,
600,
-300
],
"inputs": {
@ -292,6 +293,19 @@
"color": "#575963"
}
},
"ImageDetectionPrompt_1": {
"nodeType": "ImageDetectionPrompt",
"position": [
0,
200
],
"inputs": {
"input": "{CameraInit_1.output}"
},
"internalInputs": {
"color": "#575963"
}
},
"ImageMatchingMultiSfM_1": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
@ -315,8 +329,8 @@
"ImageMatchingMultiSfM_2": {
"nodeType": "ImageMatchingMultiSfM",
"position": [
401,
-299
400,
-300
],
"inputs": {
"input": "{KeyframeSelection_1.outputSfMDataKeyframes}",
@ -370,8 +384,8 @@
"ImageMatching_3": {
"nodeType": "ImageMatching",
"position": [
-194,
-584
-200,
-500
],
"inputs": {
"input": "{FeatureExtraction_2.input}",
@ -383,16 +397,15 @@
"color": "#384a55"
}
},
"ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentationPrompt",
"ImageSegmentationBox_2": {
"nodeType": "ImageSegmentationBox",
"position": [
0,
200,
200
],
"inputs": {
"input": "{CameraInit_1.output}",
"maskInvert": true,
"keepFilename": true
"input": "{ImageDetectionPrompt_1.input}",
"bboxFolder": "{ImageDetectionPrompt_1.output}"
},
"internalInputs": {
"color": "#575963"
@ -407,9 +420,6 @@
"inputs": {
"inputPaths": [
"{ApplyCalibration_1.output}"
],
"maskPaths": [
"{ImageSegmentationPrompt_1.output}"
]
},
"internalInputs": {
@ -419,8 +429,8 @@
"MeshDecimate_1": {
"nodeType": "MeshDecimate",
"position": [
1947,
123
2000,
100
],
"inputs": {
"input": "{MeshFiltering_2.outputMesh}",
@ -433,8 +443,8 @@
"MeshFiltering_2": {
"nodeType": "MeshFiltering",
"position": [
1206,
-584
1200,
-500
],
"inputs": {
"inputMesh": "{Meshing_2.outputMesh}"
@ -446,8 +456,8 @@
"Meshing_2": {
"nodeType": "Meshing",
"position": [
1006,
-584
1000,
-500
],
"inputs": {
"input": "{DepthMapFilter_2.input}",
@ -460,8 +470,8 @@
"PrepareDenseScene_2": {
"nodeType": "PrepareDenseScene",
"position": [
406,
-584
400,
-500
],
"inputs": {
"input": "{StructureFromMotion_3.output}"
@ -473,8 +483,8 @@
"Publish_1": {
"nodeType": "Publish",
"position": [
2362,
-139
2400,
-100
],
"inputs": {
"inputFiles": [
@ -488,14 +498,14 @@
"ScenePreview_1": {
"nodeType": "ScenePreview",
"position": [
2148,
211
2200,
200
],
"inputs": {
"cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentationPrompt_1.output}"
"masks": "{ImageSegmentationBox_2.output}"
},
"internalInputs": {
"color": "#4c594c"
@ -559,8 +569,8 @@
"StructureFromMotion_3": {
"nodeType": "StructureFromMotion",
"position": [
206,
-584
200,
-500
],
"inputs": {
"input": "{FeatureMatching_4.input}",
@ -577,8 +587,8 @@
"Texturing_2": {
"nodeType": "Texturing",
"position": [
1406,
-584
1400,
-500
],
"inputs": {
"input": "{Meshing_2.output}",