-soup2ls voxel is now the final vs initial voxel size

Signed-off-by: Ken Museth <ken.museth@gmail.com>

Author: kmuseth

openvdb_cmd/vdb_tool/include/Tool.h

@@ -1647,7 +1647,7 @@ float Tool::estimateVoxelSize(int maxDim,  float halfWidth, int geo_age)
     throw std::invalid_argument("estimateVoxelSize: invalid maxDim");
   }
   const auto d = bbox.extents()[bbox.maxExtent()];// longest extent of bbox along any coordinate axis
-  return static_cast<float>(static_cast<float>(d)/static_cast<float>(maxDim - static_cast<int>(2.f * halfWidth)));
+  return static_cast<float>(static_cast<double>(d)/static_cast<double>(maxDim - static_cast<int>(2.f * halfWidth)));
 }// Tool::estimateVoxelSize
 
 // ==============================================================================================================
@@ -1692,28 +1692,31 @@ void Tool::meshToLevelSet()
 // ==============================================================================================================
 
 // vdb_tool -read ~/dev/data/ply/cube.ply -soup2ls dim=64 lod=4 erode=5 -o vdb="*" stdout.vdb | vdb_view
-// ./openvdb_cmd/vdb_tool/vdb_tool -i ~/dev/data/obj/Robot_arm.obj -soup2ls voxel=51.2 lod=8 erode=16 -print -o codec=blosc openvdb_10.vdb
+// ./openvdb_cmd/vdb_tool/vdb_tool -i ~/dev/data/obj/Robot_arm.obj -soup2ls voxel=0.2 lod=8 erode=16 -print -o codec=blosc openvdb_10.vdb
 void Tool::soupToLevelSet()
 {
   const std::string &name = mParser.getAction().name;
   OPENVDB_ASSERT(name == "soup2ls");
   try {
     mParser.printAction();
-    const int dim = mParser.get<int>("dim");// initial dimension
-    float voxel = mParser.get<float>("voxel");// initial voxel size 
+    const int dim = mParser.get<int>("dim");// final dimension
+    float voxel = mParser.get<float>("voxel");// final voxel size 
     const float width = mParser.get<float>("width");
     const int geo_age = mParser.get<int>("geo");
     const int nErode = mParser.get<int>("erode");
     const int nLOD = mParser.get<int>("lod");
     const bool keep = mParser.get<bool>("keep");
     std::string grid_name = mParser.get<std::string>("name");
-    if (voxel == 0.0f) voxel = this->estimateVoxelSize(dim, width, geo_age);
+    if (voxel == 0.0f) {
+      voxel = this->estimateVoxelSize(dim, width, geo_age);
+      std::cerr << "estimated voxel size = " << voxel << " from dim = " << dim << std::endl;
+    }
     auto it = this->getGeom(geo_age);
     const Geometry &mesh = **it;
     if (mesh.isPoints()) this->warning("Warning: -soup2ls was called on points, not a mesh! Hint: use -points2ls instead!");
     bool isSDF = false;
     util::CpuTimer timer;
-    double t_offset = 0.0, t_erode = 0.0, t_upsample = 0.0;// all in milliseconds
+    double t_offset = 0.0, t_deform = 0.0, t_upscale = 0.0;// all in milliseconds
 
     auto myUpsample = [&](const GridT &grid)->GridT::Ptr{
       timer.start();
@@ -1726,7 +1729,7 @@ void Tool::soupToLevelSet()
 #else
       GridT::Ptr outGrid = createLevelSet<GridT>(dx/2, width);
       tools::resampleToMatch<tools::BoxSampler>(grid, *outGrid);
-      t_upsample += timer.milliseconds();
+      t_upscale += timer.milliseconds();
       return outGrid;
 #endif
     };// myUpsample
@@ -1780,18 +1783,18 @@ void Tool::soupToLevelSet()
       filter->offset(dx);// erode by dx
       isSDF = false;// the next CSG operation will mess up the SDF
       auto tmp = tools::csgUnionCopy(grid, gridB);
-      t_erode += timer.milliseconds();
+      t_deform += timer.milliseconds();
       return tmp;
     };// myLevelSetDeform
 
     if (mParser.verbose) mTimer.start("Soup -> SDF");
 
     // Main algorithm
-    float dx = voxel, target_dx = dx / pow(2, nLOD) ;// lets use the same notation for the voxel size as the paper
+    float dx = voxel * pow(2, nLOD);
     auto grid = myOffset(dx);
     //grid->setName("soup2ls_"+std::to_string(dx));
     //mGrid.push_back(grid);
-    while(dx > target_dx) {
+    while(dx > voxel) {
       dx *= 0.5f;// refinement
       grid = myUpsample(*grid);
       auto base = myOffset(dx);
@@ -1800,14 +1803,14 @@ void Tool::soupToLevelSet()
       //mGrid.push_back(grid);
     }
     //grid = tools::levelSetRebuild(*grid, /*iso-value=*/0.0f, width);// SDF -> mesh -> SDF
-    if (dx!=target_dx) std::cerr << "dx = " << dx << ", target_dx = " << target_dx << std::endl;
-    t_offset   /= 1000.0;
-    t_erode    /= 1000.0;
-    t_upsample /= 1000.0;
-    std::cerr << "offset = " << t_offset
-              << "s, erode = " << t_erode
-              << "s, upsample = " << t_upsample
-              << "s, total = " << (t_offset + t_erode + t_upsample) << "s\n";
+    if (dx!=voxel) std::cerr << "dx = " << dx << ", expected dx = " << voxel << std::endl;
+    t_offset  /= 1000.0;
+    t_deform  /= 1000.0;
+    t_upscale /= 1000.0;
+    std::cerr << "upsample = " << t_upscale
+              << "s, offset = " << t_offset
+              << "s, deform = " << t_deform
+              << "s, total = " << (t_offset + t_deform + t_upscale) << "s\n";
 
     if (grid_name.empty()) grid_name = "soup2ls_" + mesh.getName();
     grid->setName(grid_name);