Merge pull request #382 from alicevision/dev_densePointCloud

Dense point cloud
alicevision · Feb 28, 2019 · 9b23384 · 9b23384
2 parents 94796f1 + e9969d5
commit 9b23384
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 28 deletions.
diff --git a/meshroom/multiview.py b/meshroom/multiview.py
@@ -134,12 +134,11 @@ def mvsPipeline(graph, sfm=None):
                                depthMapsFolder=depthMapFilter.depthMapsFolder,
                                depthMapsFilterFolder=depthMapFilter.output)
     meshFiltering = graph.addNewNode('MeshFiltering',
-                               input=meshing.output)
+                                     inputMesh=meshing.outputMesh)
     texturing = graph.addNewNode('Texturing',
-                                 input=meshing.input,
+                                 input=meshing.output,
                                  imagesFolder=depthMap.imagesFolder,
-                                 inputDenseReconstruction=meshing.outputDenseReconstruction,
-                                 inputMesh=meshFiltering.output)
+                                 inputMesh=meshFiltering.outputMesh)
 
     return [
         prepareDenseScene,

diff --git a/meshroom/nodes/aliceVision/ExportColoredPointCloud.py b/meshroom/nodes/aliceVision/ExportColoredPointCloud.py
@@ -0,0 +1,36 @@
+__version__ = "1.0"
+
+from meshroom.core import desc
+
+
+class ExportColoredPointCloud(desc.CommandLineNode):
+    commandLine = 'aliceVision_exportColoredPointCloud {allParams}'
+
+    inputs = [
+        desc.File(
+            name='input',
+            label='Input SfMData',
+            description='SfMData file containing a complete SfM.',
+            value='',
+            uid=[0],
+        ),
+        desc.ChoiceParam(
+            name='verboseLevel',
+            label='Verbose Level',
+            description='Verbosity level (fatal, error, warning, info, debug, trace).',
+            value='info',
+            values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
+            exclusive=True,
+            uid=[],
+        ),
+    ]
+
+    outputs = [
+        desc.File(
+            name='output',
+            label='Output Point Cloud Filepath',
+            description='Output point cloud with visibilities as SfMData file.',
+            value="{cache}/{nodeType}/{uid0}/pointCloud.abc",
+            uid=[],
+        ),
+    ]
diff --git a/meshroom/nodes/aliceVision/MeshFiltering.py b/meshroom/nodes/aliceVision/MeshFiltering.py
@@ -1,4 +1,4 @@
-__version__ = "1.0"
+__version__ = "2.0"
 
 from meshroom.core import desc
 
@@ -8,8 +8,8 @@ class MeshFiltering(desc.CommandLineNode):
 
     inputs = [
         desc.File(
-            name='input',
-            label='Input',
+            name='inputMesh',
+            label='Input Mesh',
             description='''Input Mesh (OBJ file format).''',
             value='',
             uid=[0],
@@ -59,8 +59,8 @@ class MeshFiltering(desc.CommandLineNode):
 
     outputs = [
         desc.File(
-            name='output',
-            label='Output',
+            name='outputMesh',
+            label='Output Mesh',
             description='''Output mesh (OBJ file format).''',
             value=desc.Node.internalFolder + 'mesh.obj',
             uid=[],

diff --git a/meshroom/nodes/aliceVision/Meshing.py b/meshroom/nodes/aliceVision/Meshing.py
@@ -1,4 +1,4 @@
-__version__ = "2.0"
+__version__ = "3.0"
 
 from meshroom.core import desc
 
@@ -209,6 +209,14 @@ class Meshing(desc.CommandLineNode):
             uid=[0],
             advanced=True,
         ),
+        desc.BoolParam(
+            name='saveRawDensePointCloud',
+            label='Save Raw Dense Point Cloud',
+            description='Save dense point cloud before cut and filtering.',
+            value=False,
+            uid=[],
+            advanced=True,
+        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',
@@ -223,17 +231,16 @@ class Meshing(desc.CommandLineNode):
     outputs = [
         desc.File(
             name="output",
-            label="Output mesh",
+            label="Output Dense Point Cloud",
+            description="Output dense point cloud with visibilities (SfMData file format).",
+            value="{cache}/{nodeType}/{uid0}/densePointCloud.abc",
+            uid=[],
+        ),
+            desc.File(
+            name="outputMesh",
+            label="Output Mesh",
             description="Output mesh (OBJ file format).",
             value="{cache}/{nodeType}/{uid0}/mesh.obj",
             uid=[],
-            ),
-        desc.File(
-            name="outputDenseReconstruction",
-            label="Output reconstruction",
-            description="Output dense reconstruction (BIN file format).",
-            value="{cache}/{nodeType}/{uid0}/denseReconstruction.bin",
-            uid=[],
-            group="",
-            ),
+        ),
     ]
diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py
@@ -1,4 +1,4 @@
-__version__ = "3.0"
+__version__ = "4.0"
 
 from meshroom.core import desc
 
@@ -22,13 +22,6 @@ class Texturing(desc.CommandLineNode):
             value='',
             uid=[0],
         ),
-        desc.File(
-            name='inputDenseReconstruction',
-            label='Input Dense Reconstruction',
-            description='Path to the dense reconstruction result (mesh with per vertex visibility).',
-            value='',
-            uid=[0],
-        ),
         desc.File(
             name='inputMesh',
             label='Other Input Mesh',