3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-04 20:56:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

use export distortion and new segmentation

Browse source
This commit is contained in:
Fabien Servant 2024-09-25 13:54:17 +02:00 • committed by Candice Bentéjac
parent 9088f0b106
commit 5dea1f5f61
6 changed files with 65 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
meshroom/pipelines/cameraTracking.mg
View file

@ -17,7 +17,7 @@
"FeatureMatching": "2.0", "FeatureMatching": "2.0",
"ImageMatching": "2.0", "ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0", "ImageMatchingMultiSfM": "1.0",
"ImageSegmentation": "1.2", "ImageSegmentationPrompt": "0.1",
"KeyframeSelection": "5.0", "KeyframeSelection": "5.0",
"MeshDecimate": "1.0", "MeshDecimate": "1.0",
"MeshFiltering": "3.0", "MeshFiltering": "3.0",
@ -179,7 +179,7 @@
], ],
"inputs": { "inputs": {
"input": "{ApplyCalibration_1.output}", "input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentation_1.output}", "masksFolder": "{ImageSegmentationPrompt_1.output}",
"maskExtension": "exr" "maskExtension": "exr"
}, },
"internalInputs": { "internalInputs": {
@ -292,8 +292,8 @@
"color": "#80766f" "color": "#80766f"
} }
}, },
"ImageSegmentation_1": { "ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentation", "nodeType": "ImageSegmentationPrompt",
"position": [ "position": [
0, 0,
200 200
@ -318,7 +318,7 @@
"{ApplyCalibration_1.output}" "{ApplyCalibration_1.output}"
], ],
"maskPaths": [ "maskPaths": [
"{ImageSegmentation_1.output}" "{ImageSegmentationPrompt_1.output}"
] ]
}, },
"internalInputs": { "internalInputs": {
@ -380,7 +380,7 @@
"inputs": { "inputs": {
"input": "{SfMTriangulation_1.output}", "input": "{SfMTriangulation_1.output}",
"masksFolders": [ "masksFolders": [
"{ImageSegmentation_1.output}" "{ImageSegmentationPrompt_1.output}"
], ],
"maskExtension": "exr" "maskExtension": "exr"
}, },
@ -413,7 +413,7 @@
"cameras": "{ConvertSfMFormat_1.output}", "cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}", "model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}" "masks": "{ImageSegmentationPrompt_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#4c594c" "color": "#4c594c"

32
meshroom/pipelines/cameraTrackingWithoutCalibration.mg
View file

@ -6,6 +6,7 @@
"nodesVersions": { "nodesVersions": {
"ApplyCalibration": "1.0", "ApplyCalibration": "1.0",
"CameraInit": "11.0", "CameraInit": "11.0",
"ConvertDistortion": "1.0",
"ConvertSfMFormat": "2.0", "ConvertSfMFormat": "2.0",
"DepthMap": "5.0", "DepthMap": "5.0",
"DepthMapFilter": "4.0", "DepthMapFilter": "4.0",
@ -15,7 +16,7 @@
"FeatureMatching": "2.0", "FeatureMatching": "2.0",
"ImageMatching": "2.0", "ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0", "ImageMatchingMultiSfM": "1.0",
"ImageSegmentation": "1.2", "ImageSegmentationPrompt": "0.1",
"KeyframeSelection": "5.0", "KeyframeSelection": "5.0",
"MeshDecimate": "1.0", "MeshDecimate": "1.0",
"MeshFiltering": "3.0", "MeshFiltering": "3.0",
@ -54,6 +55,19 @@
"color": "#575963" "color": "#575963"
} }
}, },
"ConvertDistortion_1": {
"nodeType": "ConvertDistortion",
"position": [
1600,
360
],
"inputs": {
"input": "{StructureFromMotion_1.output}"
},
"internalInputs": {
"color": "#80766f"
}
},
"ConvertSfMFormat_1": { "ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat", "nodeType": "ConvertSfMFormat",
"position": [ "position": [
@ -118,10 +132,10 @@
"nodeType": "ExportDistortion", "nodeType": "ExportDistortion",
"position": [ "position": [
1800, 1800,
200 360
], ],
"inputs": { "inputs": {
"input": "{ExportAnimatedCamera_1.input}" "input": "{ConvertDistortion_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#80766f" "color": "#80766f"
@ -135,7 +149,7 @@
], ],
"inputs": { "inputs": {
"input": "{ApplyCalibration_1.output}", "input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentation_1.output}", "masksFolder": "{ImageSegmentationPrompt_1.output}",
"maskExtension": "exr" "maskExtension": "exr"
}, },
"internalInputs": { "internalInputs": {
@ -248,8 +262,8 @@
"color": "#80766f" "color": "#80766f"
} }
}, },
"ImageSegmentation_1": { "ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentation", "nodeType": "ImageSegmentationPrompt",
"position": [ "position": [
0, 0,
200 200
@ -274,7 +288,7 @@
"{ApplyCalibration_1.output}" "{ApplyCalibration_1.output}"
], ],
"maskPaths": [ "maskPaths": [
"{ImageSegmentation_1.output}" "{ImageSegmentationPrompt_1.output}"
] ]
}, },
"internalInputs": { "internalInputs": {
@ -336,7 +350,7 @@
"inputs": { "inputs": {
"input": "{SfMTriangulation_1.output}", "input": "{SfMTriangulation_1.output}",
"masksFolders": [ "masksFolders": [
"{ImageSegmentation_1.output}" "{ImageSegmentationPrompt_1.output}"
], ],
"maskExtension": "exr" "maskExtension": "exr"
}, },
@ -369,7 +383,7 @@
"cameras": "{ConvertSfMFormat_1.output}", "cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}", "model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}" "masks": "{ImageSegmentationPrompt_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#4c594c" "color": "#4c594c"

10
meshroom/pipelines/nodalCameraTracking.mg
View file

@ -14,7 +14,7 @@
"FeatureExtraction": "1.3", "FeatureExtraction": "1.3",
"FeatureMatching": "2.0", "FeatureMatching": "2.0",
"ImageMatching": "2.0", "ImageMatching": "2.0",
"ImageSegmentation": "1.2", "ImageSegmentationPrompt": "0.1",
"NodalSfM": "2.0", "NodalSfM": "2.0",
"Publish": "1.3", "Publish": "1.3",
"RelativePoseEstimating": "2.0", "RelativePoseEstimating": "2.0",
@ -140,7 +140,7 @@
], ],
"inputs": { "inputs": {
"input": "{ApplyCalibration_1.output}", "input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentation_1.output}" "masksFolder": "{ImageSegmentationPrompt_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#80766f" "color": "#80766f"
@ -178,8 +178,8 @@
"color": "#80766f" "color": "#80766f"
} }
}, },
"ImageSegmentation_1": { "ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentation", "nodeType": "ImageSegmentationPrompt",
"position": [ "position": [
0, 0,
200 200
@ -247,7 +247,7 @@
"cameras": "{ConvertSfMFormat_1.output}", "cameras": "{ConvertSfMFormat_1.output}",
"model": "{NodalSfM_1.output}", "model": "{NodalSfM_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}", "masks": "{ImageSegmentationPrompt_1.output}",
"pointCloudParams": { "pointCloudParams": {
"particleSize": 0.001, "particleSize": 0.001,
"particleColor": "Red" "particleColor": "Red"

32
meshroom/pipelines/nodalCameraTrackingWithoutCalibration.mg
View file

@ -5,13 +5,14 @@
"template": true, "template": true,
"nodesVersions": { "nodesVersions": {
"CameraInit": "11.0", "CameraInit": "11.0",
"ConvertDistortion": "1.0",
"ConvertSfMFormat": "2.0", "ConvertSfMFormat": "2.0",
"ExportAnimatedCamera": "2.0", "ExportAnimatedCamera": "2.0",
"ExportDistortion": "1.0", "ExportDistortion": "1.0",
"FeatureExtraction": "1.3", "FeatureExtraction": "1.3",
"FeatureMatching": "2.0", "FeatureMatching": "2.0",
"ImageMatching": "2.0", "ImageMatching": "2.0",
"ImageSegmentation": "1.2", "ImageSegmentationPrompt": "0.1",
"NodalSfM": "2.0", "NodalSfM": "2.0",
"Publish": "1.3", "Publish": "1.3",
"RelativePoseEstimating": "2.0", "RelativePoseEstimating": "2.0",
@ -31,6 +32,19 @@
"color": "#80766f" "color": "#80766f"
} }
}, },
"ConvertDistortion_1": {
"nodeType": "ConvertDistortion",
"position": [
1600,
0
],
"inputs": {
"input": "{ExportAnimatedCamera_1.input}"
},
"internalInputs": {
"color": "#80766f"
}
},
"ConvertSfMFormat_1": { "ConvertSfMFormat_1": {
"nodeType": "ConvertSfMFormat", "nodeType": "ConvertSfMFormat",
"position": [ "position": [
@ -64,11 +78,11 @@
"ExportDistortion_1": { "ExportDistortion_1": {
"nodeType": "ExportDistortion", "nodeType": "ExportDistortion",
"position": [ "position": [
1600, 1800,
0 0
], ],
"inputs": { "inputs": {
"input": "{ExportAnimatedCamera_1.input}" "input": "{ConvertDistortion_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#80766f" "color": "#80766f"
@ -81,8 +95,8 @@
0 0
], ],
"inputs": { "inputs": {
"input": "{ImageSegmentation_1.input}", "input": "{ImageSegmentationPrompt_1.input}",
"masksFolder": "{ImageSegmentation_1.output}" "masksFolder": "{ImageSegmentationPrompt_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#80766f" "color": "#80766f"
@ -120,8 +134,8 @@
"color": "#80766f" "color": "#80766f"
} }
}, },
"ImageSegmentation_1": { "ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentation", "nodeType": "ImageSegmentationPrompt",
"position": [ "position": [
0, 0,
0 0
@ -153,7 +167,7 @@
"Publish_1": { "Publish_1": {
"nodeType": "Publish", "nodeType": "Publish",
"position": [ "position": [
1800, 2000,
0 0
], ],
"inputs": { "inputs": {
@ -189,7 +203,7 @@
"cameras": "{ConvertSfMFormat_1.output}", "cameras": "{ConvertSfMFormat_1.output}",
"model": "{NodalSfM_1.output}", "model": "{NodalSfM_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}", "masks": "{ImageSegmentationPrompt_1.output}",
"pointCloudParams": { "pointCloudParams": {
"particleSize": 0.001, "particleSize": 0.001,
"particleColor": "Red" "particleColor": "Red"

12
meshroom/pipelines/photogrammetryAndCameraTracking.mg
View file

@ -17,7 +17,7 @@
"FeatureMatching": "2.0", "FeatureMatching": "2.0",
"ImageMatching": "2.0", "ImageMatching": "2.0",
"ImageMatchingMultiSfM": "1.0", "ImageMatchingMultiSfM": "1.0",
"ImageSegmentation": "1.2", "ImageSegmentationPrompt": "0.1",
"KeyframeSelection": "5.0", "KeyframeSelection": "5.0",
"MeshDecimate": "1.0", "MeshDecimate": "1.0",
"MeshFiltering": "3.0", "MeshFiltering": "3.0",
@ -190,7 +190,7 @@
], ],
"inputs": { "inputs": {
"input": "{ApplyCalibration_1.output}", "input": "{ApplyCalibration_1.output}",
"masksFolder": "{ImageSegmentation_1.output}", "masksFolder": "{ImageSegmentationPrompt_1.output}",
"maskExtension": "exr" "maskExtension": "exr"
}, },
"internalInputs": { "internalInputs": {
@ -383,8 +383,8 @@
"color": "#384a55" "color": "#384a55"
} }
}, },
"ImageSegmentation_1": { "ImageSegmentationPrompt_1": {
"nodeType": "ImageSegmentation", "nodeType": "ImageSegmentationPrompt",
"position": [ "position": [
0, 0,
200 200
@ -409,7 +409,7 @@
"{ApplyCalibration_1.output}" "{ApplyCalibration_1.output}"
], ],
"maskPaths": [ "maskPaths": [
"{ImageSegmentation_1.output}" "{ImageSegmentationPrompt_1.output}"
] ]
}, },
"internalInputs": { "internalInputs": {
@ -495,7 +495,7 @@
"cameras": "{ConvertSfMFormat_1.output}", "cameras": "{ConvertSfMFormat_1.output}",
"model": "{MeshDecimate_1.output}", "model": "{MeshDecimate_1.output}",
"undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}", "undistortedImages": "{ExportAnimatedCamera_1.outputUndistorted}",
"masks": "{ImageSegmentation_1.output}" "masks": "{ImageSegmentationPrompt_1.output}"
}, },
"internalInputs": { "internalInputs": {
"color": "#4c594c" "color": "#4c594c"

2
meshroom/submitters/simpleFarmConfig.json
View file

@ -1,5 +1,5 @@
{ {
"BASE": ["mikrosRender"], "BASE": ["mikrosRender", "!ld7"],
"CPU": { "CPU": {
"NONE": [], "NONE": [],
"NORMAL": ["mikrosRender"], "NORMAL": ["mikrosRender"],