From 7fcb265f0bd53c3e171c848bad6baa4317cf9507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Vital?= Date: Tue, 22 Aug 2023 13:29:50 +0200 Subject: [PATCH 1/2] [pipelines] add ImageSegmentation node to tracking pipelines --- meshroom/pipelines/cameraTracking.mg | 57 ++++++++++++------- .../photogrammetryAndCameraTracking.mg | 51 +++++++++++------ 2 files changed, 71 insertions(+), 37 deletions(-) diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index 97ffcbcadb..29824842f0 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -5,30 +5,31 @@ "fileVersion": "1.1", "template": true, "nodesVersions": { - "DepthMap": "4.0", - "PrepareDenseScene": "3.0", - "Publish": "1.3", - "KeyframeSelection": "4.1", - "SfMTransfer": "2.1", - "ApplyCalibration": "1.0", - "ImageMatchingMultiSfM": "1.0", - "DepthMapFilter": "3.0", + "MeshDecimate": "1.0", "Texturing": "6.0", - "ImageMatching": "2.0", - "MeshFiltering": "3.0", - "FeatureMatching": "2.0", - "ScenePreview": "1.0", - "SfMTriangulation": "1.0", - "CheckerboardDetection": "1.0", - "ConvertSfMFormat": "2.0", + "ExportDistortion": "1.0", "CameraInit": "9.0", + "ImageMatchingMultiSfM": "1.0", "StructureFromMotion": "3.1", - "MeshDecimate": "1.0", - "ExportAnimatedCamera": "2.0", + "FeatureExtraction": "1.3", + "ApplyCalibration": "1.0", + "SfMTriangulation": "1.0", + "Publish": "1.3", + "DepthMap": "4.0", "DistortionCalibration": "3.0", + "DepthMapFilter": "3.0", + "ImageSegmentation": "1.0", + "CheckerboardDetection": "1.0", + "ScenePreview": "1.0", "Meshing": "7.0", - "ExportDistortion": "1.0", - "FeatureExtraction": "1.3" + "PrepareDenseScene": "3.0", + "ImageMatching": "2.0", + "KeyframeSelection": "4.1", + "ConvertSfMFormat": "2.0", + "ExportAnimatedCamera": "2.0", + "FeatureMatching": "2.0", + "SfMTransfer": "2.1", + "MeshFiltering": "3.0" } }, "graph": { @@ -78,7 +79,10 @@ 200 ], "inputs": { - "input": "{ApplyCalibration_1.output}" + "input": "{ApplyCalibration_1.output}", + "masksFolder": "{ImageSegmentation_1.output}", + "maskExtension": "exr", + "maskInvert": true }, "internalInputs": { "color": "#575963" @@ -485,6 +489,19 @@ "label": "FeatureMatchingFramesToKeyframes", "color": "#80766f" } + }, + "ImageSegmentation_1": { + "nodeType": "ImageSegmentation", + "position": [ + 3, + 200 + ], + "inputs": { + "input": "{CameraInit_1.output}" + }, + "internalInputs": { + "color": "#575963" + } } } } \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index 4fee741f4b..10c594f93b 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -5,28 +5,29 @@ "fileVersion": "1.1", "template": true, "nodesVersions": { - "FeatureMatching": "2.0", - "ConvertSfMFormat": "2.0", - "PrepareDenseScene": "3.0", - "Meshing": "7.0", - "KeyframeSelection": "4.1", - "FeatureExtraction": "1.3", - "MeshFiltering": "3.0", - "DepthMap": "4.0", - "ImageMatching": "2.0", - "DistortionCalibration": "3.0", + "MeshDecimate": "1.0", "Texturing": "6.0", - "DepthMapFilter": "3.0", + "ExportDistortion": "1.0", "CameraInit": "9.0", - "ScenePreview": "1.0", + "ImageMatchingMultiSfM": "1.0", "StructureFromMotion": "3.1", - "ExportDistortion": "1.0", + "FeatureExtraction": "1.3", "ApplyCalibration": "1.0", "Publish": "1.3", + "DepthMap": "4.0", + "DistortionCalibration": "3.0", + "DepthMapFilter": "3.0", + "ImageSegmentation": "1.0", + "CheckerboardDetection": "1.0", + "ScenePreview": "1.0", + "Meshing": "7.0", + "PrepareDenseScene": "3.0", + "ImageMatching": "2.0", + "KeyframeSelection": "4.1", + "ConvertSfMFormat": "2.0", "ExportAnimatedCamera": "2.0", - "MeshDecimate": "1.0", - "ImageMatchingMultiSfM": "1.0", - "CheckerboardDetection": "1.0" + "FeatureMatching": "2.0", + "MeshFiltering": "3.0" } }, "graph": { @@ -49,7 +50,10 @@ 200 ], "inputs": { - "input": "{ApplyCalibration_1.output}" + "input": "{ApplyCalibration_1.output}", + "masksFolder": "{ImageSegmentation_1.output}", + "maskExtension": "exr", + "maskInvert": true }, "internalInputs": { "color": "#575963" @@ -561,6 +565,19 @@ "internalInputs": { "color": "#575963" } + }, + "ImageSegmentation_1": { + "nodeType": "ImageSegmentation", + "position": [ + 6, + 203 + ], + "inputs": { + "input": "{CameraInit_1.output}" + }, + "internalInputs": { + "color": "#575963" + } } } } \ No newline at end of file From e5a9573a4346b7a9241413bb8aa68e27e21ecdb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Tue, 22 Aug 2023 16:36:36 +0200 Subject: [PATCH 2/2] [pipelines] Align `ImageSegmentation` nodes with others --- meshroom/pipelines/cameraTracking.mg | 2 +- meshroom/pipelines/photogrammetryAndCameraTracking.mg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index 29824842f0..62531ea8ea 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -493,7 +493,7 @@ "ImageSegmentation_1": { "nodeType": "ImageSegmentation", "position": [ - 3, + 0, 200 ], "inputs": { diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index 10c594f93b..342521dd2b 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -569,8 +569,8 @@ "ImageSegmentation_1": { "nodeType": "ImageSegmentation", "position": [ - 6, - 203 + 0, + 200 ], "inputs": { "input": "{CameraInit_1.output}"