Rename export_StructuredRegularToNanoVDB to export_StructuredVolumeToNanoVDB

Author: tarcila

tsd/apps/tools/tsdVolumeToNanoVDB.cpp

@@ -157,7 +157,7 @@ int main(int argc, const char *argv[])
         "Detected rectilinear grid; writing NanoVDB sidecar with axis coordinates.");
   }
 
-  tsd::io::export_StructuredRegularVolumeToNanoVDB(spatialField,
+  tsd::io::export_StructuredVolumeToNanoVDB(spatialField,
       outputFile->c_str(),
       undefinedValue.has_value(),
       undefinedValue.value_or(0.0f),

tsd/src/tsd/io/CMakeLists.txt

@@ -49,7 +49,7 @@ PRIVATE
   procedural/generate_randomSpheres.cpp
   procedural/generate_rtow.cpp
   procedural/generate_sphereSetVolume.cpp
-  serialization/export_RegularVolumeToNanoVDB.cpp
+  serialization/export_StructuredVolumeToNanoVDB.cpp
   serialization/NanoVdbSidecar.cpp
   serialization/export_SceneToUSD.cpp
   serialization/serialization_datatree.cpp

tsd/src/tsd/io/serialization.hpp

@@ -37,7 +37,7 @@ void load_Scene(Scene &scene, core::DataNode &root);
 
 void export_SceneToUSD(
     Scene &scene, const char *filename, int framesPerSecond = 30);
-void export_StructuredRegularVolumeToNanoVDB(
+void export_StructuredVolumeToNanoVDB(
   const SpatialField* spatialField,
   std::string_view outputFilename,
   bool useUndefinedValue = false,

…zation/export_RegularVolumeToNanoVDB.cpp …ion/export_StructuredVolumeToNanoVDB.cpptsd/src/tsd/io/serialization/export_RegularVolumeToNanoVDB.cpp renamed to tsd/src/tsd/io/serialization/export_StructuredVolumeToNanoVDB.cpp tsd/src/tsd/io/serialization/export_RegularVolumeToNanoVDB.cpp renamed to tsd/src/tsd/io/serialization/export_StructuredVolumeToNanoVDB.cpp

@@ -28,9 +28,10 @@ using namespace std::string_view_literals;
 namespace tsd::io {
 
 template <typename T>
-void doExportStructuredRegularVolumeToNanoVDB(const T *data,
+void doExportStructuredVolumeToNanoVDB(const T *data,
     math::float3 origin,
     math::float3 spacing,
+    math::float3 mapSpacing,
     math::int3 dims,
     std::string_view outputFilename,
     bool useUndefinedValue,
@@ -39,17 +40,17 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
     bool enableDithering)
 {
   tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Volume dimensions: %u x %u x %u",
+      "[export_StructuredVolumeToNanoVDB] Volume dimensions: %u x %u x %u",
       dims.x,
       dims.y,
       dims.z);
   tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Origin: (%.3f, %.3f, %.3f)",
+      "[export_StructuredVolumeToNanoVDB] Origin: (%.3f, %.3f, %.3f)",
       origin.x,
       origin.y,
       origin.z);
   tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Spacing: (%.3f, %.3f, %.3f)",
+      "[export_StructuredVolumeToNanoVDB] Spacing: (%.3f, %.3f, %.3f)",
       spacing.x,
       spacing.y,
       spacing.z);
@@ -67,14 +68,14 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
   // mutable.
   constexpr size_t MatrixSize = 3;
   const std::array<std::array<double, MatrixSize>, MatrixSize> mat = {{
-      {{spacing.x, 0.0, 0.0}}, // row 0
-      {{0.0, spacing.y, 0.0}}, // row 1
-      {{0.0, 0.0, spacing.z}} // row 2
+      {{mapSpacing.x, 0.0, 0.0}}, // row 0
+      {{0.0, mapSpacing.y, 0.0}}, // row 1
+      {{0.0, 0.0, mapSpacing.z}} // row 2
   }};
   const std::array<std::array<double, MatrixSize>, MatrixSize> invMat = {{
-      {{1.0 / spacing.x, 0.0, 0.0}}, // row 0
-      {{0.0, 1.0 / spacing.y, 0.0}}, // row 1
-      {{0.0, 0.0, 1.0 / spacing.z}} // row 2
+      {{1.0 / mapSpacing.x, 0.0, 0.0}}, // row 0
+      {{0.0, 1.0 / mapSpacing.y, 0.0}}, // row 1
+      {{0.0, 0.0, 1.0 / mapSpacing.z}} // row 2
   }};
   const std::array<double, MatrixSize> trans = {origin.x, origin.y, origin.z};
   const_cast<nanovdb::Map &>(buildGrid->map())
@@ -142,7 +143,7 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
       : 0.0f;
 
   tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Active voxels: %zu/%zu (%.1f%% inactive cell compression)",
+      "[export_StructuredVolumeToNanoVDB] Active voxels: %zu/%zu (%.1f%% inactive cell compression)",
       activeVoxelsCount,
       totalVoxelsCount,
       inactiveCellCompression * 100.0f);
@@ -152,11 +153,11 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
   // Validate quantization choice
   if (precision == VDBPrecision::Fp4 && valueRange > 30.0f) {
     tsd::core::logWarning(
-        "[export_StructuredRegularVolumeToNanoVDB] Fp4 quantization with value range %.2f may introduce significant error (recommended < 30.0)",
+        "[export_StructuredVolumeToNanoVDB] Fp4 quantization with value range %.2f may introduce significant error (recommended < 30.0)",
         valueRange);
   } else if (precision == VDBPrecision::Fp8 && valueRange > 500.0f) {
     tsd::core::logWarning(
-        "[export_StructuredRegularVolumeToNanoVDB] Fp8 quantization with value range %.2f may introduce significant error (recommended < 500.0)",
+        "[export_StructuredVolumeToNanoVDB] Fp8 quantization with value range %.2f may introduce significant error (recommended < 500.0)",
         valueRange);
   }
 
@@ -203,7 +204,7 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
     break;
   case VDBPrecision::Half:
     tsd::core::logWarning(
-        "[export_StructuredRegularVolumeToNanoVDB] Half precision not supported in this NanoVDB build, using Fp16 instead");
+        "[export_StructuredVolumeToNanoVDB] Half precision not supported in this NanoVDB build, using Fp16 instead");
     handle = nanovdb::tools::createNanoGrid<nanovdb::tools::build::Grid<float>,
         nanovdb::Fp16>(*buildGrid,
         nanovdb::tools::StatsMode::All,
@@ -215,7 +216,7 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
 
   if (!handle) {
     tsd::core::logError(
-        "[export_StructuredRegularVolumeToNanoVDB] Failed to create NanoVDB grid.");
+        "[export_StructuredVolumeToNanoVDB] Failed to create NanoVDB grid.");
     return;
   }
 
@@ -229,12 +230,12 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
       : 0.0f;
 
   tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Quantization compression: %.1f%% (%.2f MB -> %.2f MB)",
+      "[export_StructuredVolumeToNanoVDB] Quantization compression: %.1f%% (%.2f MB -> %.2f MB)",
       quantizationCompression * 100.0f,
       uncompressedActiveSize / (1024.0f * 1024.0f),
       finalSize / (1024.0f * 1024.0f));
   tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Total compression: %.1f%% (%.2f MB -> %.2f MB)",
+      "[export_StructuredVolumeToNanoVDB] Total compression: %.1f%% (%.2f MB -> %.2f MB)",
       totalCompression * 100.0f,
       uncompressedSize / (1024.0f * 1024.0f),
       finalSize / (1024.0f * 1024.0f));
@@ -244,16 +245,16 @@ void doExportStructuredRegularVolumeToNanoVDB(const T *data,
     nanovdb::io::writeGrid(
         std::string(outputFilename).c_str(), handle, nanovdb::io::Codec::NONE);
     tsd::core::logStatus(
-        "[export_StructuredRegularVolumeToNanoVDB] Successfully wrote VDB file: %s",
+        "[export_StructuredVolumeToNanoVDB] Successfully wrote VDB file: %s",
         std::string(outputFilename).c_str());
   } catch (const std::exception &e) {
     tsd::core::logError(
-        "[export_StructuredRegularVolumeToNanoVDB] Failed to write VDB file: %s",
+        "[export_StructuredVolumeToNanoVDB] Failed to write VDB file: %s",
         e.what());
   }
 }
 
-void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
+void export_StructuredVolumeToNanoVDB(const SpatialField *spatialField,
     std::string_view outputFilename,
     bool useUndefinedValue,
     float undefinedValue,
@@ -268,7 +269,7 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
 
   if (!isStructuredRegular && !isStructuredRectilinear) {
     tsd::core::logError(
-        "[export_StructuredRegularVolumeToNanoVDB] Not a structured volume.");
+        "[export_StructuredVolumeToNanoVDB] Not a structured volume.");
     return;
   }
 
@@ -281,14 +282,13 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
   // Dumb heuristic here: everything but cell is node-centered
   const bool cellCentered = dataCentering == "cell"sv;
 
-  tsd::core::logStatus(
-      "[export_StructuredRegularVolumeToNanoVDB] Data centering: %s",
+  tsd::core::logStatus("[export_StructuredVolumeToNanoVDB] Data centering: %s",
       dataCentering.c_str());
 
   const auto *volumeData = spatialField->parameterValueAsObject<Array>("data");
   if (!volumeData) {
     tsd::core::logError(
-        "[export_StructuredRegularVolumeToNanoVDB] No volume data found.");
+        "[export_StructuredVolumeToNanoVDB] No volume data found.");
     return;
   }
 
@@ -297,6 +297,7 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
 
   math::float3 origin{};
   math::float3 spacing{};
+  math::float3 centeredSpacing{};
 
   NanoVdbSidecar sidecar;
   sidecar.schemaVersion = 1;
@@ -321,7 +322,8 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
         math::float3(0.0f));
     spacing = spatialField->parameterValueAs<math::float3>("spacing").value_or(
         math::float3(1.0f));
-    spacing = cellCentered ? spacing : spacing / dims * (dims - math::int3(1));
+    centeredSpacing =
+        cellCentered ? spacing : spacing / dims * (dims - math::int3(1));
 
     sidecar.origin = origin;
     sidecar.spacing = spacing;
@@ -334,7 +336,7 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
 
     if (!axisX || !axisY || !axisZ) {
       tsd::core::logError(
-          "[export_StructuredRegularVolumeToNanoVDB] Missing rectilinear coordinates.");
+          "[export_StructuredVolumeToNanoVDB] Missing rectilinear coordinates.");
       return;
     }
 
@@ -359,13 +361,13 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
     if (!copyAxis(axisX, coordsX) || !copyAxis(axisY, coordsY)
         || !copyAxis(axisZ, coordsZ)) {
       tsd::core::logError(
-          "[export_StructuredRegularVolumeToNanoVDB] Rectilinear coordinates must be float or double.");
+          "[export_StructuredVolumeToNanoVDB] Rectilinear coordinates must be float or double.");
       return;
     }
 
     if (coordsX.size() < 2 || coordsY.size() < 2 || coordsZ.size() < 2) {
       tsd::core::logError(
-          "[export_StructuredRegularVolumeToNanoVDB] Rectilinear coordinates must have at least two entries per axis.");
+          "[export_StructuredVolumeToNanoVDB] Rectilinear coordinates must have at least two entries per axis.");
       return;
     }
 
@@ -378,16 +380,25 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
             static_cast<float>(coordsY.back() - coordsY.front()),
             static_cast<float>(coordsZ.back() - coordsZ.front()));
 
+    auto divisor = cellCentered ? dims : (dims - math::int3(1));
+    divisor.x = std::max(divisor.x, 1);
+    divisor.y = std::max(divisor.y, 1);
+    divisor.z = std::max(divisor.z, 1);
+
+    centeredSpacing = extent / math::float3(divisor);
+    spacing = centeredSpacing;
+
     // For rectilinear grids, only export coordinate arrays, not origin/spacing
     sidecar.coordsX = coordsX;
     sidecar.coordsY = coordsY;
     sidecar.coordsZ = coordsZ;
   }
 
   auto dispatchExport = [&](auto ptr) {
-    doExportStructuredRegularVolumeToNanoVDB(ptr,
+    doExportStructuredVolumeToNanoVDB(ptr,
         origin,
         spacing,
+        centeredSpacing,
         dims,
         outputFilename,
         useUndefinedValue,
@@ -417,7 +428,7 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
     break;
   default:
     tsd::core::logError(
-        "[export_StructuredRegularVolumeToNanoVDB] Volume data is not of a supported float type.");
+        "[export_StructuredVolumeToNanoVDB] Volume data is not of a supported float type.");
     return;
   }
 
@@ -426,12 +437,11 @@ void export_StructuredRegularVolumeToNanoVDB(const SpatialField *spatialField,
   std::string sidecarError;
   if (!writeSidecar(sidecar, sidecarPath, sidecarError)) {
     tsd::core::logWarning(
-        "[export_StructuredRegularVolumeToNanoVDB] Failed to write sidecar %s: %s",
+        "[export_StructuredVolumeToNanoVDB] Failed to write sidecar %s: %s",
         sidecarPath.string().c_str(),
         sidecarError.c_str());
   } else {
-    tsd::core::logStatus(
-        "[export_StructuredRegularVolumeToNanoVDB] Wrote sidecar: %s",
+    tsd::core::logStatus("[export_StructuredVolumeToNanoVDB] Wrote sidecar: %s",
         sidecarPath.string().c_str());
   }
 }

tsd/src/tsd/ui/imgui/modals/ExportNanoVDBFileDialog.cpp

@@ -111,9 +111,10 @@ void ExportNanoVDBFileDialog::buildUI()
       auto spatialFieldObject = selectedObject->parameterValueAsObject("value");
 
       if (!spatialFieldObject
-          || (spatialFieldObject->subtype() != core::tokens::volume::structuredRegular &&
-              spatialFieldObject->subtype() != core::tokens::volume::structuredRectilinear)
-      ) {
+          || (spatialFieldObject->subtype()
+                  != core::tokens::volume::structuredRegular
+              && spatialFieldObject->subtype()
+                  != core::tokens::volume::structuredRectilinear)) {
         core::logError(
             "[ExportVDBFileDialog] Selected TransferFunction1D does not reference a structured regular volume.");
         return;
@@ -145,7 +146,7 @@ void ExportNanoVDBFileDialog::buildUI()
         break;
       }
 
-      io::export_StructuredRegularVolumeToNanoVDB(
+      io::export_StructuredVolumeToNanoVDB(
           static_cast<const core::SpatialField *>(spatialFieldObject),
           m_filename.c_str(),
           m_enableUndefinedValue,