[texturing] (WIP) change bump mapping parameters

alicevision · Aug 16, 2021 · e4454b5 · e4454b5
1 parent f6956c0
commit e4454b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/aliceVision/mesh/Texturing.hpp b/src/aliceVision/mesh/Texturing.hpp
@@ -53,12 +53,12 @@ std::string EUnwrapMethod_enumToString(EUnwrapMethod method);
 
 
 
-struct NormalsParams
+struct BumpMappingParams
 {
     imageIO::EImageFileType normalMapFileType;
     imageIO::EImageFileType heightMapFileType;
 
-    std::string heightMapUsage = "displacement";
+    std::string bumpType = "normal";
 };
 
 struct TexturingParams

diff --git a/src/software/pipeline/main_texturing.cpp b/src/software/pipeline/main_texturing.cpp
@@ -61,7 +61,7 @@ int aliceVision_main(int argc, char* argv[])
     std::string unwrapMethod = mesh::EUnwrapMethod_enumToString(mesh::EUnwrapMethod::Basic);
     std::string visibilityRemappingMethod = mesh::EVisibilityRemappingMethod_enumToString(texParams.visibilityRemappingMethod);
 
-    mesh::NormalsParams normalsParams;
+    mesh::BumpMappingParams bumpMappingParams;
 
     po::options_description allParams("AliceVision texturing");
 
@@ -89,11 +89,11 @@ int aliceVision_main(int argc, char* argv[])
             "output mesh file type")
         ("outputTextureFileType", po::value<imageIO::EImageFileType>(&texParams.textureFileType)->default_value(imageIO::EImageFileType::NONE),
           imageIO::EImageFileType_informations().c_str())
-        ("outputNormalMapFileType", po::value<imageIO::EImageFileType>(&normalsParams.normalMapFileType)->default_value(imageIO::EImageFileType::NONE),
+        ("bumpMappingFormat", po::value<imageIO::EImageFileType>(&bumpMappingParams.normalMapFileType)->default_value(imageIO::EImageFileType::NONE),
             imageIO::EImageFileType_informations().c_str())
-        ("outputHeightMapFileType", po::value<imageIO::EImageFileType>(&normalsParams.heightMapFileType)->default_value(imageIO::EImageFileType::NONE),
+        ("displacementMappingFormat", po::value<imageIO::EImageFileType>(&bumpMappingParams.heightMapFileType)->default_value(imageIO::EImageFileType::NONE),
             imageIO::EImageFileType_informations().c_str())
-        ("heightMapUsage", po::value<std::string>(&normalsParams.heightMapUsage)->default_value(normalsParams.heightMapUsage),
+        ("bumpType", po::value<std::string>(&bumpMappingParams.bumpType)->default_value(bumpMappingParams.bumpType),
             "Use HeightMap for displacement or bump mapping")
         ("unwrapMethod", po::value<std::string>(&unwrapMethod)->default_value(unwrapMethod),
             "Method to unwrap input mesh if it does not have UV coordinates.\n"