Merge branch 'master' into tsc_2021_06-29

danrbailey · danrbailey · commit c4fe65d132de · 2021-07-22T11:27:25.000-07:00
diff --git a/CHANGES b/CHANGES
@@ -28,21 +28,22 @@ Version 8.1.1 - In development
     - Improved the doxygen deprecation listings, folder layouts and fixes
       issues when using later versions of doxygen.
 
-Version 8.1.0 - In development
+
+Version 8.1.0 - June 11, 2021
 
       As of this release, support for grid ABI=5 has been removed.
 
     New features:
     - Added tools::erodeActiveValues() to match the existing
       tools::dilateActiveValues(). New erosion tools support all tile policies
-      and edge/vertex neighbour patterns.
+      and edge/vertex neighbor patterns.
     - Added support for automatic filtering of active tiles in tools::Filter
       by setting tools::Filter::setProcessTiles. Active tiles are densified
       on demand, only when necessary.
     - Added tools::visitNodesDepthFirst and tools::DepthFirstNodeVisitor which
       visit nodes in a tree or sub-tree in single-threaded depth-first order.
     - Significant performance improvements to AX volume kernels, primarily due
-      to improved vectorisation. Performance scales depending on the available
+      to improved vectorization. Performance scales depending on the available
       host CPU instruction set and scalability of the AX kernel. Trivial
       assignments profile upwards of 3x faster on AVX.
     - Introduced Active Tile Streaming for volumes kernels. AX can now
@@ -106,7 +107,7 @@ Version 8.1.0 - In development
       performance regression.
     - tools::deactivate now also works with a MaskTree.
     - Fixed a memory leak in the OpenVDB AX parser
-    - Fixed an occurrence of undefined behaviour in the OpenVDB AX visitor
+    - Fixed an occurrence of undefined behavior in the OpenVDB AX visitor
     - Fixed some memory leaks in the OpenVDB and OpenVDB AX unit tests
     - Fixed a bug in AX which could cause string allocations in loops to overflow
       the stack
@@ -138,14 +139,14 @@ Version 8.1.0 - In development
       OpenVDB AX code in Houdini on VDB grids.
     - Updated the VDB Smooth SOP to support the filtering of active tiles.
     - Fixed a parameter warning in VDB AX SOP.
-    - Transfer Surface Attributes in Convert VDB SOP could use uninitialised
+    - Transfer Surface Attributes in Convert VDB SOP could use uninitialized
       memory.
     - VDB Activate SOP now uses the multi-threaded tools::deactivate for much
       faster performance.
     - Improved the formatting and updated the OpenVDB AX SOPs help card.
-    - The AX SOP utilises the new Active Tile Streaming feature for Volumes.
+    - The AX SOP utilizes the new Active Tile Streaming feature for Volumes.
       Grids will only be densified in areas where unique values are created.
-    - VDB Activate SOP dilation will affect tiles, changing its behaviour
+    - VDB Activate SOP dilation will affect tiles, changing its behavior
       from previous versions, but producing a more expected result.
     - VDB Activate SOP has a world space dilation option.
     - Introduced the VDB Merge SOP that merges multiple grids in parallel and
@@ -185,7 +186,7 @@ Version 8.1.0 - In development
     - Added an option OPENVDB_ENABLE_UNINSTALL to allow the toggling of the
       uninstall build target.
       [Contributed by Jérémie Dumas]
-    - Improved the behaviour of locating static zlib libraries when
+    - Improved the behavior of locating static zlib libraries when
       USE_STATIC_DEPENDENCIES is enabled.
     - Fixed an issue where extra hboost libraries could not be found when
       building against Houdini 18.5 on Windows.
diff --git a/doc/changes.txt b/doc/changes.txt
@@ -35,9 +35,10 @@ Build:
   issues when using later versions of doxygen.
 
 
+
 @htmlonly <a name="v8_1_0_changes"></a>@endhtmlonly
 @par
-<B>Version 8.1.0</B> - <I>In development</I>
+<B>Version 8.1.0</B> - <I>June 11, 2021</I>
 
 @par
 <BLOCKQUOTE>
@@ -49,7 +50,7 @@ New features:
 - Added @vdblink::tools::erodeActiveValues() tools::erodeActiveValues@endlink,
   to match the existing
   @vdblink::tools::dilateActiveValues() tools::dilateActiveValues@endlink. New
-  erosion tools support all tile policies and edge/vertex neighbour patterns.
+  erosion tools support all tile policies and edge/vertex neighbor patterns.
 - Added support for automatic filtering of active tiles in
   @vdblink::tools::Filter Filter@endlink
   by setting
@@ -58,7 +59,7 @@ New features:
 - Added tools::visitNodesDepthFirst and tools::DepthFirstNodeVisitor which
   visit nodes in a tree or sub-tree in single-threaded depth-first order.
 - Significant performance improvements to AX volume kernels, primarily due to
-  improved vectorisation. Performance scales depending on the available host
+  improved vectorization. Performance scales depending on the available host
   CPU instruction set and scalability of the AX kernel. Trivial assignments
   profile upwards of 3x faster on AVX.
 - Introduced Active Tile Streaming for volumes kernels. AX can now dynamically
@@ -130,7 +131,7 @@ Bug Fixes:
 - @vdblink::tools::deactivate() tools::deactivate@endlink now also works with
   a MaskTree.
 - Fixed a memory leak in the OpenVDB AX parser
-- Fixed an occurrence of undefined behaviour in the OpenVDB AX visitor
+- Fixed an occurrence of undefined behavior in the OpenVDB AX visitor
 - Fixed some memory leaks in the OpenVDB and OpenVDB AX unit tests
 - Fixed a bug in AX which could cause string allocations in loops to overflow
   the stack
@@ -167,15 +168,15 @@ Houdini:
   OpenVDB AX code in Houdini on VDB grids.
 - Updated the VDB Smooth SOP to support the filtering of active tiles.
 - Fixed a parameter warning in VDB AX SOP.
-- Transfer Surface Attributes in Convert VDB SOP could use uninitialised
+- Transfer Surface Attributes in Convert VDB SOP could use uninitialized
   memory.
 - VDB Activate SOP now uses the multi-threaded
   @vdblink::tools::deactivate() tools::deactivate@endlink for much faster
   performance.
 - Improved the formatting and updated the OpenVDB AX SOPs help card.
-- The AX SOP utilises the new Active Tile Streaming feature for Volumes. Grids
+- The AX SOP utilizes the new Active Tile Streaming feature for Volumes. Grids
   will only be densified in areas where unique values are created.
-- VDB Activate SOP dilation will affect tiles, changing its behaviour
+- VDB Activate SOP dilation will affect tiles, changing its behavior
   from previous versions, but producing a more expected result.
 - VDB Activate SOP has a world space dilation option.
 - Introduced the VDB Merge SOP that merges multiple grids in parallel and is
@@ -212,7 +213,7 @@ Build:
 - Added an option OPENVDB_ENABLE_UNINSTALL to allow the toggling of the
   uninstall build target.
   <I>[Contributed by Jérémie Dumas]</I>
-- Improved the behaviour of locating static zlib libraries when
+- Improved the behavior of locating static zlib libraries when
   USE_STATIC_DEPENDENCIES is enabled.
 - Fixed an issue where extra hboost libraries could not be found when building
   against Houdini 18.5 on Windows.
diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
@@ -508,7 +508,7 @@ if(OPENVDB_CORE_STATIC)
   set_target_properties(openvdb_static
     PROPERTIES OUTPUT_NAME ${OPENVDB_STATIC_LIBRARY_NAME})
 
-  if(WIN32)
+  if(MSVC)
     if(NOT CMAKE_MSVC_RUNTIME_LIBRARY)
       # NOTE: MSVC_RUNTIME_LIBRARY does not propagate to targets, so
       # also add it explicitly as a compile option
@@ -559,7 +559,7 @@ if(OPENVDB_CORE_SHARED)
     )
   endif()
 
-  if(WIN32)
+  if(MSVC)
     if(NOT CMAKE_MSVC_RUNTIME_LIBRARY)
       # NOTE: MSVC_RUNTIME_LIBRARY does not propagate to targets, so
       # also add it explicitly as a compile option
diff --git a/openvdb/openvdb/io/TempFile.cc b/openvdb/openvdb/io/TempFile.cc
@@ -70,7 +70,11 @@ struct TempFile::TempFileImpl
     {
         if (const char* dir = std::getenv("OPENVDB_TEMP_DIR")) {
             if (0 != ::access(dir, F_OK)) {
+#ifdef _WIN32
+                ::mkdir(dir);
+#else
                 ::mkdir(dir, S_IRUSR | S_IWUSR | S_IXUSR);
+#endif
                 if (0 != ::access(dir, F_OK)) {
                     OPENVDB_THROW(IoError,
                         "failed to create OPENVDB_TEMP_DIR (" + std::string(dir) + ")");
diff --git a/openvdb/openvdb/math/Math.h b/openvdb/openvdb/math/Math.h
@@ -319,10 +319,11 @@ inline long double Abs(long double x) { return std::fabs(x); }
 inline uint32_t Abs(uint32_t i) { return i; }
 inline uint64_t Abs(uint64_t i) { return i; }
 inline bool Abs(bool b) { return b; }
-// On OSX size_t and uint64_t are different types
-#if defined(__APPLE__) || defined(MACOSX)
-inline size_t Abs(size_t i) { return i; }
-#endif
+// On systems like macOS and FreeBSD, size_t and uint64_t are different types
+template <typename T, typename std::enable_if<
+        std::is_same<T, size_t>::value
+        >::type* = nullptr>
+inline T Abs(T i) { return i; }
 //@}
 
 
diff --git a/openvdb/openvdb/unittest/TestFastSweeping.cc b/openvdb/openvdb/unittest/TestFastSweeping.cc
@@ -52,10 +52,10 @@ TEST_F(TestFastSweeping, dilateSignedDistance)
 {
     using namespace openvdb;
     // Define parameters for the level set sphere to be re-normalized
-    const float radius = 200.0f;
+    const float radius = 60.0f;
     const Vec3f center(0.0f, 0.0f, 0.0f);
     const float voxelSize = 1.0f;//half width
-    const int width = 3, new_width = 50;//half width
+    const int width = 3, new_width = 12;
 
     FloatGrid::Ptr grid = tools::createLevelSetSphere<FloatGrid>(radius, center, voxelSize, float(width));
     const size_t oldVoxelCount = grid->activeVoxelCount();
@@ -118,16 +118,16 @@ TEST_F(TestFastSweeping, dilateSignedDistance)
 TEST_F(TestFastSweeping, testMaskSdf)
 {
     using namespace openvdb;
-    // Define parameterS FOR the level set sphere to be re-normalized
-    const float radius = 200.0f;
+    // Define parameters for the level set sphere to be re-normalized
+    const float radius = 60.0f;
     const Vec3f center(0.0f, 0.0f, 0.0f);
     const float voxelSize = 1.0f, width = 3.0f;//half width
-    const float new_width = 50;
+    const float new_width = 12;
 
     {// Use box as a mask
         //std::cerr << "\nUse box as a mask" << std::endl;
         FloatGrid::Ptr grid = tools::createLevelSetSphere<FloatGrid>(radius, center, voxelSize, width);
-        CoordBBox bbox(Coord(150,-50,-50), Coord(250,50,50));
+        CoordBBox bbox(Coord(60,-25,-25), Coord(100,25,25));
         MaskGrid mask;
         mask.sparseFill(bbox, true);
 
@@ -295,7 +295,7 @@ TEST_F(TestFastSweeping, testSdfToFogVolume)
 {
     using namespace openvdb;
     // Define parameterS FOR the level set sphere to be re-normalized
-    const float radius = 200.0f;
+    const float radius = 50.0f;
     const Vec3f center(0.0f, 0.0f, 0.0f);
     const float voxelSize = 1.0f, width = 3.0f;//half width
 
@@ -333,7 +333,7 @@ TEST_F(TestFastSweeping, testSdfToFogVolume)
         //std::cerr << "Failures = " << percent << "%" << std::endl;
         //std::cerr << "Failure count = " << diagnose.failureCount() << std::endl;
         //std::cerr << "Total active voxel count = " << grid2->activeVoxelCount() << std::endl;
-        EXPECT_TRUE(percent < 3.0);
+        EXPECT_TRUE(percent < 10.0);
     }
 }// testSdfToFogVolume
 
@@ -451,19 +451,19 @@ TEST_F(TestFastSweeping, fogToSdfAndExt)
 {
   using namespace openvdb;
   const float isoValue = 0.5f;
-  const float radius = 100.0f;
+  const float radius = 50.0f;
   const float background = 0.0f;
   const float tolerance = 0.00001f;
   const Vec3f center(0.0f, 0.0f, 0.0f);
   const float voxelSize = 1.0f, width = 3.0f;//half width
   FloatGrid::Ptr grid = tools::createLevelSetSphere<FloatGrid>(radius, center, voxelSize, float(width));
   tools::sdfToFogVolume(*grid);
   EXPECT_TRUE(grid);
-  const float fog[] = {grid->tree().getValue( Coord(102, 0, 0) ),
-                       grid->tree().getValue( Coord(101, 0, 0) ),
-                       grid->tree().getValue( Coord(100, 0, 0) ),
-                       grid->tree().getValue( Coord( 99, 0, 0) ),
-                       grid->tree().getValue( Coord( 98, 0, 0) )};
+  const float fog[] = {grid->tree().getValue( Coord(52, 0, 0) ),
+                       grid->tree().getValue( Coord(51, 0, 0) ),
+                       grid->tree().getValue( Coord(50, 0, 0) ),
+                       grid->tree().getValue( Coord(49, 0, 0) ),
+                       grid->tree().getValue( Coord(48, 0, 0) )};
   //for (auto v : fog) std::cerr << v << std::endl;
   EXPECT_TRUE( math::isApproxEqual(fog[0], 0.0f, tolerance) );
   EXPECT_TRUE( math::isApproxEqual(fog[1], 0.0f, tolerance) );
@@ -475,17 +475,17 @@ TEST_F(TestFastSweeping, fogToSdfAndExt)
   auto op = [radius](const Vec3R &xyz) {return math::Sin(2*3.14*(xyz[0]+xyz[1]+xyz[2])/radius);};
   auto grids = tools::fogToSdfAndExt(*grid, op, background, isoValue);
 
-  const auto sdf1 = grids.first->tree().getValue( Coord(100, 0, 0) );
-  const auto sdf2 = grids.first->tree().getValue( Coord( 99, 0, 0) );
-  const auto sdf3 = grids.first->tree().getValue( Coord( 98, 0, 0) );
+  const auto sdf1 = grids.first->tree().getValue( Coord(50, 0, 0) );
+  const auto sdf2 = grids.first->tree().getValue( Coord(49, 0, 0) );
+  const auto sdf3 = grids.first->tree().getValue( Coord(48, 0, 0) );
   //std::cerr << "\nsdf1 = " << sdf1 << ", sdf2 = " << sdf2 << ", sdf3 = " << sdf3 << std::endl;
   EXPECT_TRUE( sdf1 > sdf2 );
   EXPECT_TRUE( math::isApproxEqual( sdf2, 0.5f, tolerance) );
   EXPECT_TRUE( math::isApproxEqual( sdf3,-0.5f, tolerance) );
 
-  const auto ext1 = grids.second->tree().getValue( Coord(100, 0, 0) );
-  const auto ext2 = grids.second->tree().getValue( Coord( 99, 0, 0) );
-  const auto ext3 = grids.second->tree().getValue( Coord( 98, 0, 0) );
+  const auto ext1 = grids.second->tree().getValue( Coord(50, 0, 0) );
+  const auto ext2 = grids.second->tree().getValue( Coord(49, 0, 0) );
+  const auto ext3 = grids.second->tree().getValue( Coord(48, 0, 0) );
   //std::cerr << "\next1 = " << ext1 << ", ext2 = " << ext2 << ", ext3 = " << ext3 << std::endl;
   EXPECT_TRUE( math::isApproxEqual(ext1, background, tolerance) );
   EXPECT_TRUE( math::isApproxEqual(ext2, ext3, tolerance) );
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Activate.cc b/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)
                     {
diff --git a/pendingchanges/mingw.txt b/pendingchanges/mingw.txt
@@ -0,0 +1,3 @@
+Build:
+  - Build fixes for MinGW on Windows
+  [Contributed by Brecht Sanders]
diff --git a/pendingchanges/vdbactivate_nnoption.txt b/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.
diff --git a/tsc/meetings/2021-06-22.md b/tsc/meetings/2021-06-22.md

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Build:`
	`2`	`+ - Build fixes for MinGW on Windows`
	`3`	`+ [Contributed by Brecht Sanders]`