diff --git a/meshroom/pipelines/cameraTracking.mg b/meshroom/pipelines/cameraTracking.mg index 4c950d6d..12c99601 100644 --- a/meshroom/pipelines/cameraTracking.mg +++ b/meshroom/pipelines/cameraTracking.mg @@ -1,34 +1,34 @@ { "header": { "pipelineVersion": "2.2", - "releaseVersion": "2023.2.0-develop", + "releaseVersion": "2023.2.0", "fileVersion": "1.1", "template": true, "nodesVersions": { - "ImageMatching": "2.0", - "ConvertSfMFormat": "2.0", - "ExportDistortion": "1.0", - "SfMTransfer": "2.1", - "KeyframeSelection": "4.1", - "FeatureExtraction": "1.2", - "DistortionCalibration": "3.0", - "Meshing": "7.0", - "MeshDecimate": "1.0", - "DepthMap": "4.0", - "MeshFiltering": "3.0", - "SfMTriangulation": "1.0", - "Texturing": "6.0", - "StructureFromMotion": "3.1", - "CameraInit": "9.0", - "ApplyCalibration": "1.0", - "PrepareDenseScene": "3.0", - "Publish": "1.3", - "ExportAnimatedCamera": "2.0", "DepthMapFilter": "3.0", + "DepthMap": "4.0", + "KeyframeSelection": "4.1", + "Meshing": "7.0", + "DistortionCalibration": "3.0", "ScenePreview": "1.0", - "ImageMatchingMultiSfM": "1.0", "CheckerboardDetection": "1.0", - "FeatureMatching": "2.0" + "FeatureExtraction": "1.2", + "FeatureMatching": "2.0", + "CameraInit": "9.0", + "Texturing": "6.0", + "Publish": "1.3", + "StructureFromMotion": "3.1", + "ConvertSfMFormat": "2.0", + "SfMTriangulation": "1.0", + "MeshDecimate": "1.0", + "ApplyCalibration": "1.0", + "MeshFiltering": "3.0", + "ImageMatching": "2.0", + "ImageMatchingMultiSfM": "1.0", + "ExportAnimatedCamera": "2.0", + "SfMTransfer": "2.1", + "PrepareDenseScene": "3.0", + "ExportDistortion": "1.0" } }, "graph": { diff --git a/meshroom/pipelines/distortionCalibration.mg b/meshroom/pipelines/distortionCalibration.mg index de9a29a1..f5d03b32 100644 --- a/meshroom/pipelines/distortionCalibration.mg +++ b/meshroom/pipelines/distortionCalibration.mg @@ -1,15 +1,15 @@ { "header": { "pipelineVersion": "2.2", - "releaseVersion": "2023.2.0-develop", + "releaseVersion": "2023.2.0", "fileVersion": "1.1", "template": true, "nodesVersions": { - "Publish": "1.2", - "ExportDistortion": "1.0", - "CameraInit": "9.0", + "DistortionCalibration": "3.0", "CheckerboardDetection": "1.0", - "DistortionCalibration": "3.0" + "CameraInit": "9.0", + "Publish": "1.3", + "ExportDistortion": "1.0" } }, "graph": { @@ -66,4 +66,4 @@ "inputs": {} } } -} +} \ No newline at end of file diff --git a/meshroom/pipelines/hdrFusion.mg b/meshroom/pipelines/hdrFusion.mg index 253a69c6..aaedec5a 100644 --- a/meshroom/pipelines/hdrFusion.mg +++ b/meshroom/pipelines/hdrFusion.mg @@ -2,12 +2,12 @@ "header": { "nodesVersions": { "Publish": "1.3", - "LdrToHdrSampling": "4.0", "LdrToHdrMerge": "4.1", - "LdrToHdrCalibration": "3.0", - "CameraInit": "9.0" + "CameraInit": "9.0", + "LdrToHdrSampling": "4.0", + "LdrToHdrCalibration": "3.0" }, - "releaseVersion": "2023.2.0-develop", + "releaseVersion": "2023.2.0", "fileVersion": "1.1", "template": true }, diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg index 84f8131d..14969e67 100644 --- a/meshroom/pipelines/panoramaFisheyeHdr.mg +++ b/meshroom/pipelines/panoramaFisheyeHdr.mg @@ -1,237 +1,237 @@ { "header": { "nodesVersions": { - "PanoramaMerging": "1.0", - "PanoramaSeams": "2.0", - "FeatureMatching": "2.0", - "PanoramaCompositing": "2.0", - "LdrToHdrMerge": "4.1", - "LdrToHdrSampling": "4.0", - "LdrToHdrCalibration": "3.0", - "PanoramaEstimation": "1.0", - "PanoramaInit": "2.0", - "CameraInit": "9.0", - "SfMTransform": "3.0", - "PanoramaPostProcessing": "1.0", - "ImageMatching": "2.0", + "PanoramaCompositing": "2.0", + "SfMTransform": "3.1", + "PanoramaPrepareImages": "1.1", "FeatureExtraction": "1.2", - "PanoramaPrepareImages": "1.1", + "Publish": "1.3", + "LdrToHdrMerge": "4.1", + "CameraInit": "9.0", + "FeatureMatching": "2.0", + "PanoramaMerging": "1.0", "PanoramaWarping": "1.1", - "Publish": "1.3" - }, - "releaseVersion": "2023.1.0", - "fileVersion": "1.1", + "LdrToHdrSampling": "4.0", + "ImageMatching": "2.0", + "PanoramaPostProcessing": "1.0", + "PanoramaSeams": "2.0", + "LdrToHdrCalibration": "3.0", + "PanoramaEstimation": "1.0", + "PanoramaInit": "2.0" + }, + "releaseVersion": "2023.2.0", + "fileVersion": "1.1", "template": true - }, + }, "graph": { "LdrToHdrMerge_1": { - "inputs": { - "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", - "byPass": "{LdrToHdrCalibration_1.byPass}", - "input": "{LdrToHdrCalibration_1.input}", - "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", - "response": "{LdrToHdrCalibration_1.response}", - "workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}" - }, - "nodeType": "LdrToHdrMerge", + "nodeType": "LdrToHdrMerge", "position": [ - 800, + 800, 0 - ] - }, + ], + "inputs": { + "input": "{LdrToHdrCalibration_1.input}", + "response": "{LdrToHdrCalibration_1.response}", + "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", + "byPass": "{LdrToHdrCalibration_1.byPass}", + "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", + "workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}" + } + }, "PanoramaWarping_1": { + "nodeType": "PanoramaWarping", + "position": [ + 2200, + 0 + ], "inputs": { "input": "{SfMTransform_1.output}" - }, - "nodeType": "PanoramaWarping", - "position": [ - 2200, - 0 - ] - }, + } + }, "LdrToHdrCalibration_1": { - "inputs": { - "samples": "{LdrToHdrSampling_1.output}", - "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", - "byPass": "{LdrToHdrSampling_1.byPass}", - "input": "{LdrToHdrSampling_1.input}", - "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}", - "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}", - "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}" - }, - "nodeType": "LdrToHdrCalibration", + "nodeType": "LdrToHdrCalibration", "position": [ - 600, + 600, 0 - ] - }, + ], + "inputs": { + "input": "{LdrToHdrSampling_1.input}", + "samples": "{LdrToHdrSampling_1.output}", + "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}", + "byPass": "{LdrToHdrSampling_1.byPass}", + "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}", + "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", + "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}" + } + }, "LdrToHdrSampling_1": { + "nodeType": "LdrToHdrSampling", + "position": [ + 400, + 0 + ], "inputs": { "input": "{PanoramaPrepareImages_1.output}" - }, - "nodeType": "LdrToHdrSampling", - "position": [ - 400, - 0 - ] - }, + } + }, "ImageMatching_1": { + "nodeType": "ImageMatching", + "position": [ + 1400, + 0 + ], "inputs": { - "input": "{PanoramaInit_1.outSfMData}", - "method": "FrustumOrVocabularyTree", + "input": "{PanoramaInit_1.outSfMData}", "featuresFolders": [ "{FeatureExtraction_1.output}" - ] - }, - "nodeType": "ImageMatching", - "position": [ - 1400, - 0 - ] - }, + ], + "method": "FrustumOrVocabularyTree" + } + }, "FeatureExtraction_1": { + "nodeType": "FeatureExtraction", + "position": [ + 1000, + 0 + ], "inputs": { + "input": "{LdrToHdrMerge_1.outSfMData}", "describerTypes": [ "sift" - ], - "describerQuality": "high", - "input": "{LdrToHdrMerge_1.outSfMData}", - "describerPreset": "high" - }, - "nodeType": "FeatureExtraction", - "position": [ - 1000, - 0 - ] - }, + ], + "describerPreset": "high", + "describerQuality": "high" + } + }, "PanoramaMerging_1": { + "nodeType": "PanoramaMerging", + "position": [ + 2800, + 0 + ], "inputs": { - "compositingFolder": "{PanoramaCompositing_1.output}", "input": "{PanoramaCompositing_1.input}", + "compositingFolder": "{PanoramaCompositing_1.output}", "useTiling": "{PanoramaCompositing_1.useTiling}" - }, - "nodeType": "PanoramaMerging", - "position": [ - 2800, - 0 - ] - }, + } + }, "PanoramaCompositing_1": { - "inputs": { - "warpingFolder": "{PanoramaSeams_1.warpingFolder}", - "labels": "{PanoramaSeams_1.output}", - "input": "{PanoramaSeams_1.outputSfm}", - "useTiling": false - }, - "nodeType": "PanoramaCompositing", + "nodeType": "PanoramaCompositing", "position": [ - 2600, + 2600, 0 - ] - }, + ], + "inputs": { + "input": "{PanoramaSeams_1.outputSfm}", + "warpingFolder": "{PanoramaSeams_1.warpingFolder}", + "labels": "{PanoramaSeams_1.output}", + "useTiling": false + } + }, "CameraInit_1": { + "nodeType": "CameraInit", + "position": [ + 0, + 0 + ], "inputs": { "allowedCameraModels": [ - "pinhole", - "radial1", - "radial3", - "brown", - "fisheye1", - "3deanamorphic4", - "3deradial4", + "pinhole", + "radial1", + "radial3", + "brown", + "fisheye1", + "3deanamorphic4", + "3deradial4", "3declassicld" ] - }, - "nodeType": "CameraInit", - "position": [ - 0, - 0 - ] - }, + } + }, "PanoramaPostProcessing_1": { - "inputs": { - "inputPanorama": "{PanoramaMerging_1.outputPanorama}", - "fillHoles": true - }, - "nodeType": "PanoramaPostProcessing", + "nodeType": "PanoramaPostProcessing", "position": [ 3000, 0 - ] - }, + ], + "inputs": { + "inputPanorama": "{PanoramaMerging_1.outputPanorama}", + "fillHoles": true + } + }, "PanoramaPrepareImages_1": { + "nodeType": "PanoramaPrepareImages", + "position": [ + 200, + 0 + ], "inputs": { "input": "{CameraInit_1.output}" - }, - "nodeType": "PanoramaPrepareImages", - "position": [ - 200, - 0 - ] - }, + } + }, "SfMTransform_1": { - "inputs": { - "method": "manual", - "input": "{PanoramaEstimation_1.output}" - }, - "nodeType": "SfMTransform", + "nodeType": "SfMTransform", "position": [ - 2000, + 2000, 0 - ] - }, + ], + "inputs": { + "input": "{PanoramaEstimation_1.output}", + "method": "manual" + } + }, "PanoramaSeams_1": { - "inputs": { - "input": "{PanoramaWarping_1.input}", - "warpingFolder": "{PanoramaWarping_1.output}" - }, - "nodeType": "PanoramaSeams", + "nodeType": "PanoramaSeams", "position": [ - 2400, + 2400, 0 - ] - }, - "PanoramaEstimation_1": { + ], "inputs": { + "input": "{PanoramaWarping_1.input}", + "warpingFolder": "{PanoramaWarping_1.output}" + } + }, + "PanoramaEstimation_1": { + "nodeType": "PanoramaEstimation", + "position": [ + 1800, + 0 + ], + "inputs": { + "input": "{FeatureMatching_1.input}", + "featuresFolders": "{FeatureMatching_1.featuresFolders}", "matchesFolders": [ "{FeatureMatching_1.output}" - ], - "input": "{FeatureMatching_1.input}", - "describerTypes": "{FeatureMatching_1.describerTypes}", - "featuresFolders": "{FeatureMatching_1.featuresFolders}" - }, - "nodeType": "PanoramaEstimation", - "position": [ - 1800, - 0 - ] - }, + ], + "describerTypes": "{FeatureMatching_1.describerTypes}" + } + }, "PanoramaInit_1": { + "nodeType": "PanoramaInit", + "position": [ + 1200, + 0 + ], "inputs": { - "useFisheye": true, + "input": "{FeatureExtraction_1.input}", "dependency": [ "{FeatureExtraction_1.output}" - ], - "input": "{FeatureExtraction_1.input}" - }, - "nodeType": "PanoramaInit", - "position": [ - 1200, - 0 - ] - }, + ], + "useFisheye": true + } + }, "FeatureMatching_1": { - "inputs": { - "describerTypes": "{FeatureExtraction_1.describerTypes}", - "imagePairsList": "{ImageMatching_1.output}", - "input": "{ImageMatching_1.input}", - "featuresFolders": "{ImageMatching_1.featuresFolders}" - }, - "nodeType": "FeatureMatching", + "nodeType": "FeatureMatching", "position": [ - 1600, + 1600, 0 - ] + ], + "inputs": { + "input": "{ImageMatching_1.input}", + "featuresFolders": "{ImageMatching_1.featuresFolders}", + "imagePairsList": "{ImageMatching_1.output}", + "describerTypes": "{FeatureExtraction_1.describerTypes}" + } }, "Publish_1": { "nodeType": "Publish", @@ -246,4 +246,4 @@ } } } -} +} \ No newline at end of file diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg index 5e77f91e..f858491d 100644 --- a/meshroom/pipelines/panoramaHdr.mg +++ b/meshroom/pipelines/panoramaHdr.mg @@ -1,231 +1,231 @@ { "header": { "nodesVersions": { - "PanoramaMerging": "1.0", - "PanoramaSeams": "2.0", - "FeatureMatching": "2.0", - "PanoramaCompositing": "2.0", - "LdrToHdrMerge": "4.1", - "LdrToHdrSampling": "4.0", - "LdrToHdrCalibration": "3.0", - "PanoramaEstimation": "1.0", - "PanoramaInit": "2.0", - "CameraInit": "9.0", - "SfMTransform": "3.0", - "PanoramaPostProcessing": "1.0", - "ImageMatching": "2.0", + "PanoramaCompositing": "2.0", + "SfMTransform": "3.1", + "PanoramaPrepareImages": "1.1", "FeatureExtraction": "1.2", - "PanoramaPrepareImages": "1.1", + "Publish": "1.3", + "LdrToHdrMerge": "4.1", + "CameraInit": "9.0", + "FeatureMatching": "2.0", + "PanoramaMerging": "1.0", "PanoramaWarping": "1.1", - "Publish": "1.3" - }, - "releaseVersion": "2023.1.0", - "fileVersion": "1.1", + "LdrToHdrSampling": "4.0", + "ImageMatching": "2.0", + "PanoramaPostProcessing": "1.0", + "PanoramaSeams": "2.0", + "LdrToHdrCalibration": "3.0", + "PanoramaEstimation": "1.0", + "PanoramaInit": "2.0" + }, + "releaseVersion": "2023.2.0", + "fileVersion": "1.1", "template": true - }, + }, "graph": { "LdrToHdrMerge_1": { - "inputs": { - "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", - "byPass": "{LdrToHdrCalibration_1.byPass}", - "input": "{LdrToHdrCalibration_1.input}", - "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", - "response": "{LdrToHdrCalibration_1.response}", - "workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}" - }, - "nodeType": "LdrToHdrMerge", + "nodeType": "LdrToHdrMerge", "position": [ - 800, + 800, 0 - ] - }, + ], + "inputs": { + "input": "{LdrToHdrCalibration_1.input}", + "response": "{LdrToHdrCalibration_1.response}", + "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", + "byPass": "{LdrToHdrCalibration_1.byPass}", + "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", + "workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}" + } + }, "PanoramaWarping_1": { + "nodeType": "PanoramaWarping", + "position": [ + 2200, + 0 + ], "inputs": { "input": "{SfMTransform_1.output}" - }, - "nodeType": "PanoramaWarping", - "position": [ - 2200, - 0 - ] - }, + } + }, "LdrToHdrCalibration_1": { - "inputs": { - "samples": "{LdrToHdrSampling_1.output}", - "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", - "byPass": "{LdrToHdrSampling_1.byPass}", - "input": "{LdrToHdrSampling_1.input}", - "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}", - "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}", - "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}" - }, - "nodeType": "LdrToHdrCalibration", + "nodeType": "LdrToHdrCalibration", "position": [ - 600, + 600, 0 - ] - }, + ], + "inputs": { + "input": "{LdrToHdrSampling_1.input}", + "samples": "{LdrToHdrSampling_1.output}", + "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}", + "byPass": "{LdrToHdrSampling_1.byPass}", + "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}", + "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", + "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}" + } + }, "LdrToHdrSampling_1": { + "nodeType": "LdrToHdrSampling", + "position": [ + 400, + 0 + ], "inputs": { "input": "{PanoramaPrepareImages_1.output}" - }, - "nodeType": "LdrToHdrSampling", - "position": [ - 400, - 0 - ] - }, + } + }, "ImageMatching_1": { + "nodeType": "ImageMatching", + "position": [ + 1400, + 0 + ], "inputs": { - "input": "{PanoramaInit_1.outSfMData}", - "method": "FrustumOrVocabularyTree", + "input": "{PanoramaInit_1.outSfMData}", "featuresFolders": [ "{FeatureExtraction_1.output}" - ] - }, - "nodeType": "ImageMatching", - "position": [ - 1400, - 0 - ] - }, + ], + "method": "FrustumOrVocabularyTree" + } + }, "FeatureExtraction_1": { - "inputs": { - "describerQuality": "high", - "input": "{LdrToHdrMerge_1.outSfMData}" - }, - "nodeType": "FeatureExtraction", + "nodeType": "FeatureExtraction", "position": [ - 1000, + 1000, 0 - ] - }, + ], + "inputs": { + "input": "{LdrToHdrMerge_1.outSfMData}", + "describerQuality": "high" + } + }, "PanoramaMerging_1": { + "nodeType": "PanoramaMerging", + "position": [ + 2800, + 0 + ], "inputs": { - "compositingFolder": "{PanoramaCompositing_1.output}", "input": "{PanoramaCompositing_1.input}", + "compositingFolder": "{PanoramaCompositing_1.output}", "useTiling": "{PanoramaCompositing_1.useTiling}" - }, - "nodeType": "PanoramaMerging", - "position": [ - 2800, - 0 - ] - }, + } + }, "PanoramaCompositing_1": { - "inputs": { - "warpingFolder": "{PanoramaSeams_1.warpingFolder}", - "labels": "{PanoramaSeams_1.output}", - "input": "{PanoramaSeams_1.outputSfm}" - }, - "nodeType": "PanoramaCompositing", + "nodeType": "PanoramaCompositing", "position": [ - 2600, + 2600, 0 - ] - }, + ], + "inputs": { + "input": "{PanoramaSeams_1.outputSfm}", + "warpingFolder": "{PanoramaSeams_1.warpingFolder}", + "labels": "{PanoramaSeams_1.output}" + } + }, "CameraInit_1": { + "nodeType": "CameraInit", + "position": [ + 0, + 0 + ], "inputs": { "allowedCameraModels": [ - "pinhole", - "radial1", - "radial3", - "brown", - "fisheye1", - "3deanamorphic4", - "3deradial4", + "pinhole", + "radial1", + "radial3", + "brown", + "fisheye1", + "3deanamorphic4", + "3deradial4", "3declassicld" ] - }, - "nodeType": "CameraInit", - "position": [ - 0, - 0 - ] - }, + } + }, "PanoramaPostProcessing_1": { - "inputs": { - "inputPanorama": "{PanoramaMerging_1.outputPanorama}", - "fillHoles": true - }, - "nodeType": "PanoramaPostProcessing", + "nodeType": "PanoramaPostProcessing", "position": [ 3000, 0 - ] - }, + ], + "inputs": { + "inputPanorama": "{PanoramaMerging_1.outputPanorama}", + "fillHoles": true + } + }, "PanoramaPrepareImages_1": { + "nodeType": "PanoramaPrepareImages", + "position": [ + 200, + 0 + ], "inputs": { "input": "{CameraInit_1.output}" - }, - "nodeType": "PanoramaPrepareImages", - "position": [ - 200, - 0 - ] - }, + } + }, "SfMTransform_1": { - "inputs": { - "method": "manual", - "input": "{PanoramaEstimation_1.output}" - }, - "nodeType": "SfMTransform", + "nodeType": "SfMTransform", "position": [ - 2000, + 2000, 0 - ] - }, + ], + "inputs": { + "input": "{PanoramaEstimation_1.output}", + "method": "manual" + } + }, "PanoramaSeams_1": { - "inputs": { - "input": "{PanoramaWarping_1.input}", - "warpingFolder": "{PanoramaWarping_1.output}" - }, - "nodeType": "PanoramaSeams", + "nodeType": "PanoramaSeams", "position": [ - 2400, + 2400, 0 - ] - }, - "PanoramaEstimation_1": { + ], "inputs": { + "input": "{PanoramaWarping_1.input}", + "warpingFolder": "{PanoramaWarping_1.output}" + } + }, + "PanoramaEstimation_1": { + "nodeType": "PanoramaEstimation", + "position": [ + 1800, + 0 + ], + "inputs": { + "input": "{FeatureMatching_1.input}", + "featuresFolders": "{FeatureMatching_1.featuresFolders}", "matchesFolders": [ "{FeatureMatching_1.output}" - ], - "input": "{FeatureMatching_1.input}", - "describerTypes": "{FeatureMatching_1.describerTypes}", - "featuresFolders": "{FeatureMatching_1.featuresFolders}" - }, - "nodeType": "PanoramaEstimation", - "position": [ - 1800, - 0 - ] - }, + ], + "describerTypes": "{FeatureMatching_1.describerTypes}" + } + }, "PanoramaInit_1": { + "nodeType": "PanoramaInit", + "position": [ + 1200, + 0 + ], "inputs": { + "input": "{FeatureExtraction_1.input}", "dependency": [ "{FeatureExtraction_1.output}" - ], - "input": "{FeatureExtraction_1.input}" - }, - "nodeType": "PanoramaInit", - "position": [ - 1200, - 0 - ] - }, + ] + } + }, "FeatureMatching_1": { - "inputs": { - "describerTypes": "{FeatureExtraction_1.describerTypes}", - "imagePairsList": "{ImageMatching_1.output}", - "input": "{ImageMatching_1.input}", - "featuresFolders": "{ImageMatching_1.featuresFolders}" - }, - "nodeType": "FeatureMatching", + "nodeType": "FeatureMatching", "position": [ - 1600, + 1600, 0 - ] + ], + "inputs": { + "input": "{ImageMatching_1.input}", + "featuresFolders": "{ImageMatching_1.featuresFolders}", + "imagePairsList": "{ImageMatching_1.output}", + "describerTypes": "{FeatureExtraction_1.describerTypes}" + } }, "Publish_1": { "nodeType": "Publish", @@ -240,4 +240,4 @@ } } } -} +} \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetry.mg b/meshroom/pipelines/photogrammetry.mg index 78112c3b..0602a936 100644 --- a/meshroom/pipelines/photogrammetry.mg +++ b/meshroom/pipelines/photogrammetry.mg @@ -1,163 +1,162 @@ { "header": { - "pipelineVersion": "2.2", - "releaseVersion": "2023.1.0", - "fileVersion": "1.1", - "template": true, + "pipelineVersion": "2.2", + "releaseVersion": "2023.2.0", + "fileVersion": "1.1", + "template": true, "nodesVersions": { - "FeatureMatching": "2.0", - "MeshFiltering": "3.0", - "Texturing": "6.0", - "PrepareDenseScene": "3.0", - "DepthMap": "4.0", - "StructureFromMotion": "3.0", - "CameraInit": "9.0", - "ImageMatching": "2.0", - "FeatureExtraction": "1.2", - "Meshing": "7.0", "DepthMapFilter": "3.0", + "Meshing": "7.0", + "DepthMap": "4.0", + "FeatureExtraction": "1.2", + "PrepareDenseScene": "3.0", + "CameraInit": "9.0", + "FeatureMatching": "2.0", + "MeshFiltering": "3.0", + "Texturing": "6.0", + "StructureFromMotion": "3.1", + "ImageMatching": "2.0", "Publish": "1.3" } - }, + }, "graph": { "Publish_1": { + "nodeType": "Publish", + "position": [ + 2200, + 0 + ], "inputs": { - "output": "", "inputFiles": [ "{Texturing_1.outputMesh}", "{Texturing_1.outputMaterial}", "{Texturing_1.outputTextures}" ] - }, - "nodeType": "Publish", - "position": [ - 2200, - 0 - ] + } }, "Texturing_1": { + "nodeType": "Texturing", + "position": [ + 2000, + 0 + ], "inputs": { - "imagesFolder": "{DepthMap_1.imagesFolder}", - "input": "{Meshing_1.output}", + "input": "{Meshing_1.output}", + "imagesFolder": "{DepthMap_1.imagesFolder}", "inputMesh": "{MeshFiltering_1.outputMesh}" - }, - "nodeType": "Texturing", - "position": [ - 2000, - 0 - ] - }, + } + }, "Meshing_1": { - "inputs": { - "depthMapsFolder": "{DepthMapFilter_1.output}", - "input": "{DepthMapFilter_1.input}" - }, - "nodeType": "Meshing", + "nodeType": "Meshing", "position": [ - 1600, + 1600, 0 - ] - }, + ], + "inputs": { + "input": "{DepthMapFilter_1.input}", + "depthMapsFolder": "{DepthMapFilter_1.output}" + } + }, "DepthMapFilter_1": { - "inputs": { - "depthMapsFolder": "{DepthMap_1.output}", - "input": "{DepthMap_1.input}" - }, - "nodeType": "DepthMapFilter", + "nodeType": "DepthMapFilter", "position": [ - 1400, + 1400, 0 - ] - }, - "ImageMatching_1": { + ], "inputs": { - "input": "{FeatureExtraction_1.input}", + "input": "{DepthMap_1.input}", + "depthMapsFolder": "{DepthMap_1.output}" + } + }, + "ImageMatching_1": { + "nodeType": "ImageMatching", + "position": [ + 400, + 0 + ], + "inputs": { + "input": "{FeatureExtraction_1.input}", "featuresFolders": [ "{FeatureExtraction_1.output}" ] - }, - "nodeType": "ImageMatching", - "position": [ - 400, - 0 - ] - }, + } + }, "FeatureExtraction_1": { + "nodeType": "FeatureExtraction", + "position": [ + 200, + 0 + ], "inputs": { "input": "{CameraInit_1.output}" - }, - "nodeType": "FeatureExtraction", - "position": [ - 200, - 0 - ] - }, + } + }, "StructureFromMotion_1": { + "nodeType": "StructureFromMotion", + "position": [ + 800, + 0 + ], "inputs": { - "describerTypes": "{FeatureMatching_1.describerTypes}", - "input": "{FeatureMatching_1.input}", - "featuresFolders": "{FeatureMatching_1.featuresFolders}", + "input": "{FeatureMatching_1.input}", + "featuresFolders": "{FeatureMatching_1.featuresFolders}", "matchesFolders": [ "{FeatureMatching_1.output}" - ] - }, - "nodeType": "StructureFromMotion", - "position": [ - 800, - 0 - ] - }, + ], + "describerTypes": "{FeatureMatching_1.describerTypes}" + } + }, "PrepareDenseScene_1": { + "nodeType": "PrepareDenseScene", + "position": [ + 1000, + 0 + ], "inputs": { "input": "{StructureFromMotion_1.output}" - }, - "nodeType": "PrepareDenseScene", - "position": [ - 1000, - 0 - ] - }, + } + }, "CameraInit_1": { - "inputs": {}, - "nodeType": "CameraInit", + "nodeType": "CameraInit", "position": [ - 0, + 0, 0 - ] - }, + ], + "inputs": {} + }, "DepthMap_1": { - "inputs": { - "imagesFolder": "{PrepareDenseScene_1.output}", - "input": "{PrepareDenseScene_1.input}" - }, - "nodeType": "DepthMap", + "nodeType": "DepthMap", "position": [ - 1200, + 1200, 0 - ] - }, + ], + "inputs": { + "input": "{PrepareDenseScene_1.input}", + "imagesFolder": "{PrepareDenseScene_1.output}" + } + }, "MeshFiltering_1": { + "nodeType": "MeshFiltering", + "position": [ + 1800, + 0 + ], "inputs": { "inputMesh": "{Meshing_1.outputMesh}" - }, - "nodeType": "MeshFiltering", - "position": [ - 1800, - 0 - ] - }, + } + }, "FeatureMatching_1": { - "inputs": { - "describerTypes": "{FeatureExtraction_1.describerTypes}", - "imagePairsList": "{ImageMatching_1.output}", - "input": "{ImageMatching_1.input}", - "featuresFolders": "{ImageMatching_1.featuresFolders}" - }, - "nodeType": "FeatureMatching", + "nodeType": "FeatureMatching", "position": [ - 600, + 600, 0 - ] + ], + "inputs": { + "input": "{ImageMatching_1.input}", + "featuresFolders": "{ImageMatching_1.featuresFolders}", + "imagePairsList": "{ImageMatching_1.output}", + "describerTypes": "{FeatureExtraction_1.describerTypes}" + } } } -} +} \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetryAndCameraTracking.mg b/meshroom/pipelines/photogrammetryAndCameraTracking.mg index 8d5d9fd6..301a37b4 100644 --- a/meshroom/pipelines/photogrammetryAndCameraTracking.mg +++ b/meshroom/pipelines/photogrammetryAndCameraTracking.mg @@ -5,28 +5,28 @@ "fileVersion": "1.1", "template": true, "nodesVersions": { - "MeshDecimate": "1.0", - "DepthMap": "4.0", - "MeshFiltering": "3.0", - "ApplyCalibration": "1.0", - "CameraInit": "9.0", - "ScenePreview": "1.0", - "StructureFromMotion": "3.1", - "PrepareDenseScene": "3.0", - "Publish": "1.3", - "ExportAnimatedCamera": "2.0", - "Texturing": "6.0", - "DepthMapFilter": "3.0", - "ImageMatchingMultiSfM": "1.0", - "CheckerboardDetection": "1.0", - "ExportDistortion": "1.0", - "FeatureMatching": "2.0", - "ImageMatching": "2.0", - "ConvertSfMFormat": "2.0", - "FeatureExtraction": "1.2", - "KeyframeSelection": "4.1", "Meshing": "7.0", - "DistortionCalibration": "3.0" + "KeyframeSelection": "4.1", + "DistortionCalibration": "3.0", + "ScenePreview": "1.0", + "DepthMapFilter": "3.0", + "DepthMap": "4.0", + "CheckerboardDetection": "1.0", + "FeatureExtraction": "1.2", + "CameraInit": "9.0", + "FeatureMatching": "2.0", + "Texturing": "6.0", + "Publish": "1.3", + "StructureFromMotion": "3.1", + "ConvertSfMFormat": "2.0", + "MeshDecimate": "1.0", + "ApplyCalibration": "1.0", + "MeshFiltering": "3.0", + "ImageMatching": "2.0", + "ImageMatchingMultiSfM": "1.0", + "ExportAnimatedCamera": "2.0", + "PrepareDenseScene": "3.0", + "ExportDistortion": "1.0" } }, "graph": { @@ -482,4 +482,4 @@ } } } -} +} \ No newline at end of file diff --git a/meshroom/pipelines/photogrammetryDraft.mg b/meshroom/pipelines/photogrammetryDraft.mg index cc7cac1c..78268b04 100644 --- a/meshroom/pipelines/photogrammetryDraft.mg +++ b/meshroom/pipelines/photogrammetryDraft.mg @@ -1,110 +1,110 @@ { "header": { "nodesVersions": { - "FeatureMatching": "2.0", - "MeshFiltering": "3.0", - "Texturing": "6.0", - "StructureFromMotion": "3.0", - "CameraInit": "9.0", - "ImageMatching": "2.0", - "FeatureExtraction": "1.2", "Meshing": "7.0", + "FeatureExtraction": "1.2", + "CameraInit": "9.0", + "FeatureMatching": "2.0", + "MeshFiltering": "3.0", + "Texturing": "6.0", + "StructureFromMotion": "3.1", + "ImageMatching": "2.0", "Publish": "1.3" - }, - "releaseVersion": "2023.1.0", - "fileVersion": "1.1", + }, + "releaseVersion": "2023.2.0", + "fileVersion": "1.1", "template": true - }, + }, "graph": { "Texturing_1": { - "inputs": { - "input": "{Meshing_1.output}", - "inputMesh": "{MeshFiltering_1.outputMesh}" - }, - "nodeType": "Texturing", + "nodeType": "Texturing", "position": [ - 1400, + 1400, 0 - ] - }, + ], + "inputs": { + "input": "{Meshing_1.output}", + "inputMesh": "{MeshFiltering_1.outputMesh}" + } + }, "Meshing_1": { + "nodeType": "Meshing", + "position": [ + 1000, + 0 + ], "inputs": { "input": "{StructureFromMotion_1.output}" - }, - "nodeType": "Meshing", - "position": [ - 1000, - 0 - ] - }, + } + }, "ImageMatching_1": { + "nodeType": "ImageMatching", + "position": [ + 400, + 0 + ], "inputs": { - "input": "{FeatureExtraction_1.input}", + "input": "{FeatureExtraction_1.input}", "featuresFolders": [ "{FeatureExtraction_1.output}" ] - }, - "nodeType": "ImageMatching", - "position": [ - 400, - 0 - ] - }, + } + }, "FeatureExtraction_1": { + "nodeType": "FeatureExtraction", + "position": [ + 200, + 0 + ], "inputs": { "input": "{CameraInit_1.output}" - }, - "nodeType": "FeatureExtraction", - "position": [ - 200, - 0 - ] - }, + } + }, "StructureFromMotion_1": { + "nodeType": "StructureFromMotion", + "position": [ + 800, + 0 + ], "inputs": { - "describerTypes": "{FeatureMatching_1.describerTypes}", - "input": "{FeatureMatching_1.input}", - "featuresFolders": "{FeatureMatching_1.featuresFolders}", + "input": "{FeatureMatching_1.input}", + "featuresFolders": "{FeatureMatching_1.featuresFolders}", "matchesFolders": [ "{FeatureMatching_1.output}" - ] - }, - "nodeType": "StructureFromMotion", - "position": [ - 800, - 0 - ] - }, + ], + "describerTypes": "{FeatureMatching_1.describerTypes}" + } + }, "CameraInit_1": { - "inputs": {}, - "nodeType": "CameraInit", + "nodeType": "CameraInit", "position": [ - 0, + 0, 0 - ] - }, + ], + "inputs": {} + }, "MeshFiltering_1": { + "nodeType": "MeshFiltering", + "position": [ + 1200, + 0 + ], "inputs": { "inputMesh": "{Meshing_1.outputMesh}" - }, - "nodeType": "MeshFiltering", - "position": [ - 1200, - 0 - ] - }, + } + }, "FeatureMatching_1": { - "inputs": { - "describerTypes": "{FeatureExtraction_1.describerTypes}", - "imagePairsList": "{ImageMatching_1.output}", - "input": "{ImageMatching_1.input}", - "featuresFolders": "{ImageMatching_1.featuresFolders}" - }, - "nodeType": "FeatureMatching", + "nodeType": "FeatureMatching", "position": [ - 600, + 600, 0 - ] + ], + "inputs": { + "input": "{ImageMatching_1.input}", + "featuresFolders": "{ImageMatching_1.featuresFolders}", + "imagePairsList": "{ImageMatching_1.output}", + "describerTypes": "{FeatureExtraction_1.describerTypes}" + } }, "Publish_1": { "nodeType": "Publish", @@ -121,4 +121,4 @@ } } } -} +} \ No newline at end of file