diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index 924299fd..8c324dcc 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -17,7 +17,7 @@ "FeatureMatching": "2.0", "ImageMatching": "2.0", "ImageMatchingMultiSfM": "1.0", - "ImageSegmentation": "1.2", + "ImageSegmentationPrompt": "0.1", "KeyframeSelection": "5.0", "MeshDecimate": "1.0", "MeshFiltering": "3.0", @@ -179,7 +179,7 @@ ], "inputs": { "input": "{ApplyCalibration_1.output}", - "masksFolder": "{ImageSegmentation_1.output}", + "masksFolder": "{ImageSegmentationPrompt_1.output}", "maskExtension": "exr" }, "internalInputs": { @@ -292,8 +292,8 @@ "color": "#80766f" } }, - "ImageSegmentation_1": { - "nodeType": "ImageSegmentation", + "ImageSegmentationPrompt_1": { + "nodeType": "ImageSegmentationPrompt", "position": [ 0, 200 @@ -318,7 +318,7 @@ "{ApplyCalibration_1.output}" ], "maskPaths": [ - "{ImageSegmentation_1.output}" + "{ImageSegmentationPrompt_1.output}" ] }, "internalInputs": { @@ -380,7 +380,7 @@ "inputs": { "input": "{SfMTriangulation_1.output}", "masksFolders": [ - "{ImageSegmentation_1.output}" + "{ImageSegmentationPrompt_1.output}" ], "maskExtension": "exr" }, @@ -413,7 +413,7 @@ "cameras": "{ConvertSfMFormat_1.output}", "model": "{MeshDecimate_1.output}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", - "masks": "{ImageSegmentation_1.output}" + "masks": "{ImageSegmentationPrompt_1.output}" }, "internalInputs": { "color": "#4c594c" diff --git a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg index 63f05ff6..c376616e 100644 --- a/meshroom/pipelines/cameraTrackingWithoutCalibration.mg +++ b/meshroom/pipelines/cameraTrackingWithoutCalibration.mg @@ -6,6 +6,7 @@ "nodesVersions": { "ApplyCalibration": "1.0", "CameraInit": "11.0", + "ConvertDistortion": "1.0", "ConvertSfMFormat": "2.0", "DepthMap": "5.0", "DepthMapFilter": "4.0", @@ -15,7 +16,7 @@ "FeatureMatching": "2.0", "ImageMatching": "2.0", "ImageMatchingMultiSfM": "1.0", - "ImageSegmentation": "1.2", + "ImageSegmentationPrompt": "0.1", "KeyframeSelection": "5.0", "MeshDecimate": "1.0", "MeshFiltering": "3.0", @@ -54,6 +55,19 @@ "color": "#575963" } }, + "ConvertDistortion_1": { + "nodeType": "ConvertDistortion", + "position": [ + 1600, + 360 + ], + "inputs": { + "input": "{StructureFromMotion_1.output}" + }, + "internalInputs": { + "color": "#80766f" + } + }, "ConvertSfMFormat_1": { "nodeType": "ConvertSfMFormat", "position": [ @@ -118,10 +132,10 @@ "nodeType": "ExportDistortion", "position": [ 1800, - 200 + 360 ], "inputs": { - "input": "{ExportAnimatedCamera_1.input}" + "input": "{ConvertDistortion_1.output}" }, "internalInputs": { "color": "#80766f" @@ -135,7 +149,7 @@ ], "inputs": { "input": "{ApplyCalibration_1.output}", - "masksFolder": "{ImageSegmentation_1.output}", + "masksFolder": "{ImageSegmentationPrompt_1.output}", "maskExtension": "exr" }, "internalInputs": { @@ -248,8 +262,8 @@ "color": "#80766f" } }, - "ImageSegmentation_1": { - "nodeType": "ImageSegmentation", + "ImageSegmentationPrompt_1": { + "nodeType": "ImageSegmentationPrompt", "position": [ 0, 200 @@ -274,7 +288,7 @@ "{ApplyCalibration_1.output}" ], "maskPaths": [ - "{ImageSegmentation_1.output}" + "{ImageSegmentationPrompt_1.output}" ] }, "internalInputs": { @@ -336,7 +350,7 @@ "inputs": { "input": "{SfMTriangulation_1.output}", "masksFolders": [ - "{ImageSegmentation_1.output}" + "{ImageSegmentationPrompt_1.output}" ], "maskExtension": "exr" }, @@ -369,7 +383,7 @@ "cameras": "{ConvertSfMFormat_1.output}", "model": "{MeshDecimate_1.output}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", - "masks": "{ImageSegmentation_1.output}" + "masks": "{ImageSegmentationPrompt_1.output}" }, "internalInputs": { "color": "#4c594c" diff --git a/meshroom/pipelines/nodalCameraTracking.mg b/meshroom/pipelines/nodalCameraTracking.mg index 372509a2..49006d4a 100644 --- a/meshroom/pipelines/nodalCameraTracking.mg +++ b/meshroom/pipelines/nodalCameraTracking.mg @@ -14,7 +14,7 @@ "FeatureExtraction": "1.3", "FeatureMatching": "2.0", "ImageMatching": "2.0", - "ImageSegmentation": "1.2", + "ImageSegmentationPrompt": "0.1", "NodalSfM": "2.0", "Publish": "1.3", "RelativePoseEstimating": "2.0", @@ -140,7 +140,7 @@ ], "inputs": { "input": "{ApplyCalibration_1.output}", - "masksFolder": "{ImageSegmentation_1.output}" + "masksFolder": "{ImageSegmentationPrompt_1.output}" }, "internalInputs": { "color": "#80766f" @@ -178,8 +178,8 @@ "color": "#80766f" } }, - "ImageSegmentation_1": { - "nodeType": "ImageSegmentation", + "ImageSegmentationPrompt_1": { + "nodeType": "ImageSegmentationPrompt", "position": [ 0, 200 @@ -247,7 +247,7 @@ "cameras": "{ConvertSfMFormat_1.output}", "model": "{NodalSfM_1.output}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", - "masks": "{ImageSegmentation_1.output}", + "masks": "{ImageSegmentationPrompt_1.output}", "pointCloudParams": { "particleSize": 0.001, "particleColor": "Red" diff --git a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg index 56acfbb0..8f6e3000 100644 --- a/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg +++ b/meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg @@ -5,13 +5,14 @@ "template": true, "nodesVersions": { "CameraInit": "11.0", + "ConvertDistortion": "1.0", "ConvertSfMFormat": "2.0", "ExportAnimatedCamera": "2.0", "ExportDistortion": "1.0", "FeatureExtraction": "1.3", "FeatureMatching": "2.0", "ImageMatching": "2.0", - "ImageSegmentation": "1.2", + "ImageSegmentationPrompt": "0.1", "NodalSfM": "2.0", "Publish": "1.3", "RelativePoseEstimating": "2.0", @@ -31,6 +32,19 @@ "color": "#80766f" } }, + "ConvertDistortion_1": { + "nodeType": "ConvertDistortion", + "position": [ + 1600, + 0 + ], + "inputs": { + "input": "{ExportAnimatedCamera_1.input}" + }, + "internalInputs": { + "color": "#80766f" + } + }, "ConvertSfMFormat_1": { "nodeType": "ConvertSfMFormat", "position": [ @@ -64,11 +78,11 @@ "ExportDistortion_1": { "nodeType": "ExportDistortion", "position": [ - 1600, + 1800, 0 ], "inputs": { - "input": "{ExportAnimatedCamera_1.input}" + "input": "{ConvertDistortion_1.output}" }, "internalInputs": { "color": "#80766f" @@ -81,8 +95,8 @@ 0 ], "inputs": { - "input": "{ImageSegmentation_1.input}", - "masksFolder": "{ImageSegmentation_1.output}" + "input": "{ImageSegmentationPrompt_1.input}", + "masksFolder": "{ImageSegmentationPrompt_1.output}" }, "internalInputs": { "color": "#80766f" @@ -120,8 +134,8 @@ "color": "#80766f" } }, - "ImageSegmentation_1": { - "nodeType": "ImageSegmentation", + "ImageSegmentationPrompt_1": { + "nodeType": "ImageSegmentationPrompt", "position": [ 0, 0 @@ -153,7 +167,7 @@ "Publish_1": { "nodeType": "Publish", "position": [ - 1800, + 2000, 0 ], "inputs": { @@ -189,7 +203,7 @@ "cameras": "{ConvertSfMFormat_1.output}", "model": "{NodalSfM_1.output}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", - "masks": "{ImageSegmentation_1.output}", + "masks": "{ImageSegmentationPrompt_1.output}", "pointCloudParams": { "particleSize": 0.001, "particleColor": "Red" diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index 6ad03320..ccd0f53c 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -17,7 +17,7 @@ "FeatureMatching": "2.0", "ImageMatching": "2.0", "ImageMatchingMultiSfM": "1.0", - "ImageSegmentation": "1.2", + "ImageSegmentationPrompt": "0.1", "KeyframeSelection": "5.0", "MeshDecimate": "1.0", "MeshFiltering": "3.0", @@ -190,7 +190,7 @@ ], "inputs": { "input": "{ApplyCalibration_1.output}", - "masksFolder": "{ImageSegmentation_1.output}", + "masksFolder": "{ImageSegmentationPrompt_1.output}", "maskExtension": "exr" }, "internalInputs": { @@ -383,8 +383,8 @@ "color": "#384a55" } }, - "ImageSegmentation_1": { - "nodeType": "ImageSegmentation", + "ImageSegmentationPrompt_1": { + "nodeType": "ImageSegmentationPrompt", "position": [ 0, 200 @@ -409,7 +409,7 @@ "{ApplyCalibration_1.output}" ], "maskPaths": [ - "{ImageSegmentation_1.output}" + "{ImageSegmentationPrompt_1.output}" ] }, "internalInputs": { @@ -495,7 +495,7 @@ "cameras": "{ConvertSfMFormat_1.output}", "model": "{MeshDecimate_1.output}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", - "masks": "{ImageSegmentation_1.output}" + "masks": "{ImageSegmentationPrompt_1.output}" }, "internalInputs": { "color": "#4c594c" diff --git a/meshroom/submitters/simpleFarmConfig.json b/meshroom/submitters/simpleFarmConfig.json index a26c2c41..85569096 100644 --- a/meshroom/submitters/simpleFarmConfig.json +++ b/meshroom/submitters/simpleFarmConfig.json @@ -1,5 +1,5 @@ { - "BASE": ["mikrosRender"], + "BASE": ["mikrosRender", "!ld7"], "CPU": { "NONE": [], "NORMAL": ["mikrosRender"],