Merge pull request #571 from alicevision/dev/texturing_retopomesh

[Texturing] add options for retopoMesh & reorganise options
alicevision · Jan 15, 2020 · 2beb349 · 2beb349
2 parents 44901f0 + 30f902b
commit 2beb349
Showing 1 changed file with 34 additions and 26 deletions.
diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py
@@ -91,32 +91,6 @@ class Texturing(desc.CommandLineNode):
             uid=[0],
             advanced=True,
         ),
-        desc.BoolParam(
-            name='correctEV',
-            label='Correct Exposure',
-            description='Uniformize images exposure values.',
-            value=False,
-            uid=[0],
-            advanced=True,
-        ),
-        desc.BoolParam(
-            name='useScore',
-            label='Use Score',
-            description='Use triangles scores for multiband blending.',
-            value=True,
-            uid=[0],
-            advanced=True,
-        ),
-        desc.ChoiceParam(
-            name='processColorspace',
-            label='Process Colorspace',
-            description="Colorspace for the texturing internal computation (does not impact the output file colorspace).",
-            value='sRGB',
-            values=('sRGB', 'LAB', 'XYZ'),
-            exclusive=True,
-            uid=[0],
-            advanced=True,
-        ),
         desc.IntParam(
             name='multiBandDownscale',
             label='Multi Band Downscale',
@@ -138,6 +112,14 @@ class Texturing(desc.CommandLineNode):
             description='''Number of contributions per frequency band for multiband blending (each frequency band also contributes to lower bands)''',
             advanced=True,
         ),
+        desc.BoolParam(
+            name='useScore',
+            label='Use Score',
+            description='Use triangles scores (ie. reprojection area) for multiband blending.',
+            value=True,
+            uid=[0],
+            advanced=True,
+        ),
         desc.FloatParam(
             name='bestScoreThreshold',
             label='Best Score Threshold',
@@ -156,6 +138,23 @@ class Texturing(desc.CommandLineNode):
             uid=[0],
             advanced=True,
         ),
+        desc.ChoiceParam(
+            name='processColorspace',
+            label='Process Colorspace',
+            description="Colorspace for the texturing internal computation (does not impact the output file colorspace).",
+            value='sRGB',
+            values=('sRGB', 'LAB', 'XYZ'),
+            exclusive=True,
+            uid=[0],
+            advanced=True,
+        ),
+        desc.BoolParam(
+            name='correctEV',
+            label='Correct Exposure',
+            description='Uniformize images exposure values.',
+            value=False,
+            uid=[0],
+        ),
         desc.BoolParam(
             name='forceVisibleByAllVertices',
             label='Force Visible By All Vertices',
@@ -182,6 +181,15 @@ class Texturing(desc.CommandLineNode):
             uid=[0],
             advanced=True,
         ),
+        desc.FloatParam(
+            name='subdivisionTargetRatio',
+            label='Subdivision Target Ratio',
+            description='''Percentage of the density of the reconstruction as the target for the subdivision (0: disable subdivision, 0.5: half density of the reconstruction, 1: full density of the reconstruction).''',
+            value=0.8,
+            range=(0.0, 1.0, 0.001),
+            uid=[0],
+            advanced=True,
+        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',