3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-23 14:06:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

[multiview] split pipeline creation into several functions

Browse source 
* add 'sfmPipeline', 'mvsPipeline' and 'photogrammetryPipeline' instantiating nodes in an existing graph
* rename main function (creating a new Graph) 'photogrammetry' + create a Publish node if 'output' is specified
This commit is contained in:
Yann Lanthony 2018-03-15 15:54:01 +01:00
parent 8ed0d0a7a2
commit b596bdffca
4 changed files with 121 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

148
meshroom/multiview.py
View file

@ -2,7 +2,7 @@ import os
import fnmatch
import re
from .core.graph import Graph, GraphModification
from meshroom.core.graph import Graph, GraphModification
def findFiles(folder, patterns):
@ -17,11 +17,23 @@ def findFiles(folder, patterns):
return outFiles
def photogrammetryPipeline(output='', inputFolder='', inputImages=[], inputViewpoints=[]):
# type: () -> Graph
graph = Graph('pipeline')
def photogrammetry(inputFolder='', inputImages=(), inputViewpoints=(), output=''):
"""
Create a new Graph with a complete photogrammetry pipeline.
Args:
inputFolder (str, optional): folder containing image files
inputImages (list of str, optional): list of image file paths
inputViewpoints (list of Viewpoint, optional): list of Viewpoints
output (str, optional): the path to export reconstructed model to
Returns:
Graph: the created graph
"""
graph = Graph('Photogrammetry')
with GraphModification(graph):
cameraInit = graph.addNewNode('CameraInit')
sfmNodes, mvsNodes = photogrammetryPipeline(graph)
cameraInit = sfmNodes[0]
if inputFolder:
images = findFiles(inputFolder, ['*.jpg', '*.png'])
cameraInit.viewpoints.extend([{'path': image} for image in images])
@ -29,35 +41,101 @@ def photogrammetryPipeline(output='', inputFolder='', inputImages=[], inputViewp
cameraInit.viewpoints.extend([{'path': image} for image in inputImages])
if inputViewpoints:
cameraInit.viewpoints.extend(inputViewpoints)
featureExtraction = graph.addNewNode('FeatureExtraction',
input=cameraInit.output)
imageMatching = graph.addNewNode('ImageMatching',
input=featureExtraction.input,
featuresFolder=featureExtraction.output,
)
featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input,
featuresFolder=imageMatching.featuresFolder,
imagePairsList=imageMatching.output)
structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input,
featuresFolder=featureMatching.featuresFolder,
matchesFolder=featureMatching.output)
prepareDenseScene = graph.addNewNode('PrepareDenseScene',
input=structureFromMotion.output)
cameraConnection = graph.addNewNode('CameraConnection',
ini=prepareDenseScene.ini)
depthMap = graph.addNewNode('DepthMap',
ini=cameraConnection.ini)
depthMapFilter = graph.addNewNode('DepthMapFilter',
depthMapFolder=depthMap.output,
ini=depthMap.ini)
meshing = graph.addNewNode('Meshing',
depthMapFolder=depthMapFilter.depthMapFolder,
depthMapFilterFolder=depthMapFilter.output,
ini=depthMapFilter.ini)
texturing = graph.addNewNode('Texturing',
ini=meshing.ini,
inputDenseReconstruction=meshing.outputDenseReconstruction)
if output:
texturing = mvsNodes[-1]
graph.addNewNode('Publish', output=output, inputFiles=[texturing.outputMesh,
texturing.outputMaterial,
texturing.outputTextures])
return graph
def photogrammetryPipeline(graph):
"""
Instantiate a complete photogrammetry pipeline inside 'graph'.
Args:
graph (Graph/UIGraph): the graph in which nodes should be instantiated
Returns:
list of Node: the created nodes
"""
sfmNodes = sfmPipeline(graph)
mvsNodes = mvsPipeline(graph, sfmNodes[-1])
return sfmNodes, mvsNodes
def sfmPipeline(graph):
"""
Instantiate a SfM pipeline inside 'graph'.
Args:
graph (Graph/UIGraph): the graph in which nodes should be instantiated
Returns:
list of Node: the created nodes
"""
cameraInit = graph.addNewNode('CameraInit')
featureExtraction = graph.addNewNode('FeatureExtraction',
input=cameraInit.output)
imageMatching = graph.addNewNode('ImageMatching',
input=featureExtraction.input,
featuresFolder=featureExtraction.output,
)
featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input,
featuresFolder=imageMatching.featuresFolder,
imagePairsList=imageMatching.output)
structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input,
featuresFolder=featureMatching.featuresFolder,
matchesFolder=featureMatching.output)
return [
cameraInit,
featureExtraction,
imageMatching,
featureMatching,
structureFromMotion
]
def mvsPipeline(graph, sfm=None):
"""
Instantiate a MVS pipeline inside 'graph'.
Args:
graph (Graph/UIGraph): the graph in which nodes should be instantiated
sfm (Node, optional): if specified, connect the MVS pipeline to this StructureFromMotion node
Returns:
list of Node: the created nodes
"""
if sfm and not sfm.nodeType == "StructureFromMotion":
raise ValueError("Invalid node type. Expected StructureFromMotion, got {}.".format(sfm.nodeType))
prepareDenseScene = graph.addNewNode('PrepareDenseScene',
input=sfm.output if sfm else "")
cameraConnection = graph.addNewNode('CameraConnection',
ini=prepareDenseScene.ini)
depthMap = graph.addNewNode('DepthMap',
ini=cameraConnection.ini)
depthMapFilter = graph.addNewNode('DepthMapFilter',
depthMapFolder=depthMap.output,
ini=depthMap.ini)
meshing = graph.addNewNode('Meshing',
depthMapFolder=depthMapFilter.depthMapFolder,
depthMapFilterFolder=depthMapFilter.output,
ini=depthMapFilter.ini)
texturing = graph.addNewNode('Texturing',
ini=meshing.ini,
inputDenseReconstruction=meshing.outputDenseReconstruction)
return [
prepareDenseScene,
cameraConnection,
depthMap,
depthMapFilter,
meshing,
texturing
]