Merge pull request #1091 from sideeffects/send_upstream_vdbactivate_nnselection

Add an option to specify the expansion pattern.

Author: jmlait

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Activate.cc

@@ -214,7 +214,7 @@ an inclusive range, so includes the maximum voxel.)"));
     Expand the active area by at least the specified number of voxels.  Does not
     support operation or setting of values.
 */
-    parms.add(hutil::ParmFactory(PRM_INT, "expand", "Voxels to Expand")
+    parms.add(hutil::ParmFactory(PRM_INT, "expand", "Expand Voxels")
                 .setDefault(PRMoneDefaults)
                 .setRange(PRM_RANGE_FREE, -5, PRM_RANGE_FREE, 5)
               .setTooltip("Expand the active area by at least the specified number of voxels.")
@@ -233,6 +233,20 @@ operation or setting of values.)"));
               .setDocumentation(
                                 R"(Expand the active area by at least the specified distance. Does not support operation or setting of values.)"));
 
+/*
+    Specifies which nearby voxels are considered neighbors for expansion.
+*/
+    parms.add(hutil::ParmFactory(PRM_STRING, "expansionpattern", "Expansion Pattern")
+        .setChoiceListItems(PRM_CHOICELIST_SINGLE, {
+            "face", "Plus",
+            "faceedge", "Diamond",
+            "faceedgevertex", "Box"
+        })
+        .setDefault("face")
+        .setTooltip("Set pattern used to identify neighbor voxels for expansion.")
+        .setDocumentation(
+R"(Specifies which nearby voxels are considered neighbors for expansion.)"));
+
     parms.addFolder("Reference");
 /*
     Uses the second input to determine the selected region.
@@ -490,16 +504,16 @@ sopFillSDF(GridType &grid, int dummy)
 
 template <typename GridType>
 static void
-sopDilateVoxels(GridType& grid, exint count)
+sopDilateVoxels(GridType& grid, exint count, openvdb::tools::NearestNeighbors nn)
 {
-    openvdb::tools::dilateActiveValues(grid.tree(), static_cast<int>(count));
+    openvdb::tools::dilateActiveValues(grid.tree(), static_cast<int>(count), nn);
 }
 
 template <typename GridType>
 static void
-sopErodeVoxels(GridType& grid, exint count)
+sopErodeVoxels(GridType& grid, exint count, openvdb::tools::NearestNeighbors nn)
 {
-    openvdb::tools::erodeActiveValues(grid.tree(), static_cast<int>(count));
+    openvdb::tools::erodeActiveValues(grid.tree(), static_cast<int>(count), nn);
     if (grid.getGridClass() == openvdb::GRID_LEVEL_SET) {
         openvdb::tools::pruneLevelSet(grid.tree());
     }
@@ -557,6 +571,7 @@ SOP_VDBActivate::Cache::cookVDBSop(OP_Context &context)
 {
     using namespace openvdb;
     using namespace openvdb::math;
+    using namespace openvdb::tools;
 
     try
     {
@@ -672,14 +687,22 @@ SOP_VDBActivate::Cache::cookVDBSop(OP_Context &context)
                                             evalFloat("expanddist", 0, t),
                                             vdb->getVoxelDiameter())));
 
+                    NearestNeighbors nn = NN_FACE;
+                    const auto str = evalStdString("expansionpattern", t);
+                    if (str == "faceedge")
+                        nn = NN_FACE_EDGE;
+                    else if (str == "faceedgevertex")
+                        nn = NN_FACE_EDGE_VERTEX;
+
                     exint maxdilate = SYSmax(dilatevoxels, dilatedist);
                     if (maxdilate > 0)
                     {
                         if (boss->opInterrupt())
                             break;
+
                         UTvdbCallAllTopology(vdb->getStorageType(),
                                          sopDilateVoxels,
-                                         vdb->getGrid(), maxdilate);
+                                         vdb->getGrid(), maxdilate, nn);
                     }
 
                     exint mindilate = SYSmin(dilatevoxels, dilatedist);
@@ -689,7 +712,7 @@ SOP_VDBActivate::Cache::cookVDBSop(OP_Context &context)
                             break;
                         UTvdbCallAllTopology(vdb->getStorageType(),
                                          sopErodeVoxels,
-                                         vdb->getGrid(), -mindilate);
+                                         vdb->getGrid(), -mindilate, nn);
                     }
                     if (mindilate < 0 && maxdilate > 0)
                     {

pendingchanges/vdbactivate_nnoption.txt

@@ -0,0 +1,4 @@
+Houdini:
+    * VDB Activate SOP now has an option for the expansion pattern to use
+      for dilation.
+    * The label for Voxels to Expand is now Expand Voxels to match Houdini.