Merge pull request #1148 from danrbailey/vdblod

Fix bug with VDB LOD SOP Chaining
AcademySoftwareFoundation · Aug 24, 2021 · af1e425 · af1e425
2 parents f9a42b3 + 13d6dd0
commit af1e425
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_LOD.cc b/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_LOD.cc
@@ -182,12 +182,26 @@ struct MultiResGridFractionalOp
     template<typename GridType>
     void operator()(const GridType& grid)
     {
+        using TreeT = typename GridType::TreeType;
         if ( level <= 0.0f ) {
             outputGrid = typename GridType::Ptr( new GridType(grid) );
         } else {
             const size_t levels = openvdb::math::Ceil(level) + 1;
-            using TreeT = typename GridType::TreeType;
-            openvdb::tools::MultiResGrid<TreeT> mrg( levels, grid );
+            const GridType* gridPtr = &grid;
+#if OPENVDB_ABI_VERSION_NUMBER >= 7 // Grid::copyReplacingMetadata() only available in ABI>=7
+            // if grid already has MultiResGrid_Level metadata with type int64, remove it
+            typename GridType::ConstPtr newGridPtr;
+            auto meta = grid.template getMetadata<openvdb::Int64Metadata>("MultiResGrid_Level");
+            if (meta) {
+                // deep copy meta map and remove element
+                openvdb::MetaMap metaMap(static_cast<const openvdb::MetaMap&>(grid));
+                metaMap.removeMeta("MultiResGrid_Level");
+                // the tree and transform are shared with the input grid, but meta map is different
+                newGridPtr = grid.copyReplacingMetadata(metaMap);
+                gridPtr = newGridPtr.get();
+            }
+#endif
+            openvdb::tools::MultiResGrid<TreeT> mrg( levels, *gridPtr );
             outputGrid = mrg.template createGrid<Order>( level );
         }
     }
@@ -205,10 +219,24 @@ struct MultiResGridRangeOp
     template<typename GridType>
     void operator()(const GridType& grid)
     {
+        using TreeT = typename GridType::TreeType;
         if ( end > 0.0f ) {
             const size_t levels = openvdb::math::Ceil(end) + 1;
-            using TreeT = typename GridType::TreeType;
-            openvdb::tools::MultiResGrid<TreeT> mrg( levels, grid );
+            const GridType* gridPtr = &grid;
+#if OPENVDB_ABI_VERSION_NUMBER >= 7 // Grid::copyReplacingMetadata() only available in ABI>=7
+            // if grid already has MultiResGrid_Level metadata with type int64, remove it
+            typename GridType::ConstPtr newGridPtr;
+            auto meta = grid.template getMetadata<openvdb::Int64Metadata>("MultiResGrid_Level");
+            if (meta) {
+                // deep copy meta map and remove element
+                openvdb::MetaMap metaMap(static_cast<const openvdb::MetaMap&>(grid));
+                metaMap.removeMeta("MultiResGrid_Level");
+                // the tree and transform are shared with the input grid, but meta map is different
+                newGridPtr = grid.copyReplacingMetadata(metaMap);
+                gridPtr = newGridPtr.get();
+            }
+#endif
+            openvdb::tools::MultiResGrid<TreeT> mrg( levels, *gridPtr );
 
             // inclusive range
             for (float level = start; !(level > end); level += step) {
@@ -231,7 +259,21 @@ struct MultiResGridIntegerOp
     void operator()(const GridType& grid)
     {
         using TreeT = typename GridType::TreeType;
-        openvdb::tools::MultiResGrid<TreeT> mrg( levels, grid );
+        const GridType* gridPtr = &grid;
+#if OPENVDB_ABI_VERSION_NUMBER >= 7 // Grid::copyReplacingMetadata() only available in ABI>=7
+        // if grid already has MultiResGrid_Level metadata with type float, remove it
+        typename GridType::ConstPtr newGridPtr;
+        auto meta = grid.template getMetadata<openvdb::FloatMetadata>("MultiResGrid_Level");
+        if (meta) {
+            // deep copy meta map and remove element
+            openvdb::MetaMap metaMap(static_cast<const openvdb::MetaMap&>(grid));
+            metaMap.removeMeta("MultiResGrid_Level");
+            // the tree and transform are shared with the input grid, but meta map is different
+            newGridPtr = grid.copyReplacingMetadata(metaMap);
+            gridPtr = newGridPtr.get();
+        }
+#endif
+        openvdb::tools::MultiResGrid<TreeT> mrg( levels, *gridPtr );
         outputGrids = mrg.grids();
     }
     const size_t levels;

diff --git a/pendingchanges/vdblod_metadata.txt b/pendingchanges/vdblod_metadata.txt
@@ -0,0 +1,2 @@
+Houdini:
+    * Fix bug to allow VDB LOD SOPs to be chained together.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Houdini:
		* Fix bug to allow VDB LOD SOPs to be chained together.