From f9f88c9932f8ef843beabbb81382bae709caaa18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Zorroch=C3=A9?= <thomas.zorroche@gmail.com>
Date: Mon, 16 Aug 2021 18:52:30 +0200
Subject: [PATCH] [nodes] change texture mapping parameters

---
 meshroom/nodes/aliceVision/Texturing.py | 47 +++++++++++++------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py
index 0962a5a1..6fac7123 100644
--- a/meshroom/nodes/aliceVision/Texturing.py
+++ b/meshroom/nodes/aliceVision/Texturing.py
@@ -78,7 +78,7 @@ Many cameras are contributing to the low frequencies and only the best ones cont
             exclusive=True,
             uid=[0],
         ),
-        desc.GroupAttribute(name="colorMap", label="Color Map", description="Color Map Parameters",
+        desc.GroupAttribute(name="colorMapping", label="Color Mapping", description="Color Map Parameters",
             enabled=lambda node: (node.imagesFolder.value != ''),
             group=None,
             groupDesc=[
@@ -91,72 +91,73 @@ Many cameras are contributing to the low frequencies and only the best ones cont
                     group=None,
                 ),
                 desc.ChoiceParam(
-                    name='outputTextureFileType',
+                    name='colorMappingFileType',
                     label='File Type',
                     description='Texture File Type',
                     value='exr',
-                    values=('jpg', 'png', 'tiff', 'exr'),
+                    values=('exr', 'png', 'tiff', 'jpg'),
                     exclusive=True,
                     uid=[0],
-                    enabled=lambda node: node.colorMap.enable.value,
+                    enabled=lambda node: node.colorMapping.enable.value,
                 ),
             ],
         ),
-        desc.GroupAttribute(name="normalMap", label="Normal Map", description="Normal Map Parameters",
+        desc.GroupAttribute(name="bumpMapping", label="Bump Mapping", description="Bump Mapping Parameters",
             enabled=lambda node: (node.inputRefMesh.value != ''),
             group=None,
             groupDesc=[
                 desc.BoolParam(
                     name='enable',
                     label='Enable',
-                    description='Generate Normal Maps',
+                    description='Generate Normal / Bump Maps',
                     value=True,
                     uid=[],
                     group=None,
                 ),
                 desc.ChoiceParam(
-                    name='outputNormalMapFileType',
+                    name='bumpType',
+                    label='Bump Type',
+                    description='Export Normal Map or Height Map',
+                    value='Normal',
+                    values=('Height', 'Normal'),
+                    exclusive=True,
+                    uid=[0],
+                    enabled=lambda node: node.bumpMapping.enable.value,
+                ),
+                desc.ChoiceParam(
+                    name='bumpMappingFileType',
                     label='File Type',
                     description='NormalMap Texture File Type',
                     value='exr',
-                    values=('jpg', 'png', 'tiff', 'exr'),
+                    #values= lambda node: ('exr', 'png', 'tiff', 'jpg') if node.bumpType.value == "Normal" else ('exr',),
+                    values = ('exr', 'png', 'tiff', 'jpg'),
                     exclusive=True,
                     uid=[0],
-                    enabled=lambda node: node.normalMap.enable.value,
+                    enabled=lambda node: node.bumpMapping.enable.value,
                 ),
             ],
         ),
-        desc.GroupAttribute(name="heightMap", label="Height Map", description="Height Map Parameters",
+        desc.GroupAttribute(name="displacementMapping", label="Displacement Mapping", description="Displacement Mapping Parameters",
             enabled=lambda node: (node.inputRefMesh.value != ''),
             group=None,
             groupDesc=[
                 desc.BoolParam(
                     name='enable',
                     label='Enable',
-                    description='Generate Height Maps',
+                    description='Generate Height Maps for Displacement',
                     value=True,
                     uid=[],
                     group=None,
                 ),
                 desc.ChoiceParam(
-                    name='outputHeightMapFileType',
+                    name='displacementMappingFileType',
                     label='File Type',
                     description='HeightMap Texture File Type',
                     value='exr',
                     values=('exr',),
                     exclusive=True,
                     uid=[0],
-                    enabled=lambda node: node.heightMap.enable.value,
-                ),
-                desc.ChoiceParam(
-                    name='heightMapUsage',
-                    label='Usage',
-                    description='Use HeightMap for displacement or bump mapping',
-                    value='displacement',
-                    values=('displacement', 'bump'),
-                    exclusive=True,
-                    uid=[0],
-                    enabled=lambda node: node.heightMap.enable.value,
+                    enabled=lambda node: node.displacementMapping.enable.value,
                 ),
             ],
         ),