Improvements and bug fixes.

Author: OpenVDB-DevTeam

openvdb/CHANGES

@@ -7,7 +7,8 @@ Version 2.2.0 - In development
     - Added an option to the LevelSetRayIntersector and to vdb_render
       to specify the isovalue of the level set.
     - Added methods to the LevelSetRayIntersector to return the time of
-      intersection along a world or index ray.
+      intersection along a world or index ray and to return the level set
+      isovalue.
     - Added bounding box support to the VolumeRayIntersector.
     - Added a section to the Cookbook on interpolation using BoxSampler, 
       GridSampler, DualGridSampler, et al.
@@ -27,18 +28,25 @@ Version 2.2.0 - In development
     - Added exp() and sum() methods to math::Vec2, math::Vec3 and math::Vec4.
     - Improved tools::fillWithSpheres() for small volumes that are just a few
       voxels across.
+    - Improved the accuracy of the mesh to volume converter.
     - Fixed a bug in the mesh to volume converter that caused incorrect sign
-      classifications for the level set rebuild tool.
+      classifications for narrow-band level sets.
+    - Fixed a bug in NonlinearFrustumMap::applyIJT() that resulted in incorrect
+      values when computing the gradient of a grid with a frustum transform.
+    - Fixed a file I/O bug whereby some .vdb files could not be read correctly
+      if they contained grids with more than two distinct inactive values.
     - Fixed a build issue reported by Clang 3.2 in tools/GridOperators.h.
-    - Fixed a bug with the gradient calculation involving frustum transforms.
-    - Fixed bugs related to new GUI paramters introduced in the "Level Set Offset" SOP. 
+    - Improved convergence in VolumeRender [Contributed by Jerry Tessendorf].
     - Made various changes for compatibility with Houdini 13 and with
       C++11 compilers.
       [Contributed by SESI]
 
     API changes:
     - tools::DualGridSampler is no longer templated on the target grid type,
       and the value accessor is now passed as an argument.
+    - The .vdb file format has changed slightly.  Tools built with older
+      versions of OpenVDB should be recompiled to ensure that they can read
+      files in the new format. 
 
     Houdini:
     - Added topology union, intersection and difference operations to
@@ -47,9 +55,10 @@ Version 2.2.0 - In development
     - Added a Divide operation to the Combine SOP.
     - Added support for boolean grids to the Combine, Resample, Scatter, Prune
       and Visualize SOPs.
-    - The Fill SOP now allows the fill region bounds to be specified either in
-      index space (as before), in world space, or using the bounds of geometry
-      connected to an optional new reference input.
+    - The Fill SOP now accepts a vector as the fill value, and it allows
+      the fill region bounds to be specified either in index space (as before),
+      in world space, or using the bounds of geometry connected to an optional
+      new reference input.
     - Added a toggle to the Offset Level Set SOP to specify the offset in
       either world or voxel units.
     - Added a toggle to the Transform and Resample SOPs to apply the

openvdb/doc/changes.txt

@@ -15,7 +15,8 @@
   and to @c vdb_render to specify the isovalue of the level set.
 - Added methods to the 
   @vdblink::tools::LevelSetRayIntersector LevelSetRayIntersector@endlink 
-  to return the time of intersection along a world or index ray.
+  to return the time of intersection along a world or index ray and to
+  return the level set isovalue.
 - Added bounding box support to the
   @vdblink::tools::VolumeRayIntersector VolumeRayIntersector@endlink.
 - Added a @ref sInterpolation "section" to the Cookbook on interpolation
@@ -44,13 +45,20 @@
   @vdblink::math::Vec3::sum() sum@endlink methods to
   @vdblink::math::Vec2 Vec2@endlink, @vdblink::math::Vec3 Vec3@endlink
   and @vdblink::math::Vec4 Vec4@endlink.
-- Improved tools::fillWithSpheres() for small volumes that are just a few
-  voxels across.
+- Improved the @vdblink::tools::fillWithSpheres() fillWithSpheres@endlink
+  tool for small volumes that are just a few voxels across.
+- Improved the accuracy of the mesh to volume converter.
 - Fixed a bug in the mesh to volume converter that caused incorrect sign
-  classifications for the level set rebuild tool.
-- Fixed a bug in @vdblink::math::NonlinearFrustumMap::applyIJT NonlinearFrustumMap::applyIJT@endlink.
+  classifications for narrow-band level sets.
+- Fixed a bug in @vdblink::math::NonlinearFrustumMap::applyIJT()
+  NonlinearFrustumMap::applyIJT@endlink that resulted in incorrect values
+  when computing the gradient of a grid with a frustum transform.
+- Fixed a file I/O bug whereby some <TT>.vdb</TT> files could not be read
+  correctly if they contained grids with more than two distinct inactive
+  values.
 - Fixed a build issue reported by Clang&nbsp;3.2 in tools/GridOperators.h.
-- Fixed bugs related to new GUI paramters introduced in the "Level Set Offset" SOP.
+- Improved convergence in @vdblink::tools::VolumeRender VolumeRender@endlink. 
+  <I>[Contributed by Jerry Tessendorf]</I>
 - Made various changes for compatibility with Houdini&nbsp;13 and with
   C++11 compilers.
   <I>[Contributed&nbsp;by&nbsp;SESI]</I>
@@ -60,6 +68,9 @@ API changes:
 - @vdblink::tools::DualGridSampler DualGridSampler@endlink is no longer 
   templated on the target grid type, and the value accessor is now passed 
   as an argument.
+- The <TT>.vdb</TT> file format has changed slightly.  Tools built with older
+  versions of OpenVDB should be recompiled to ensure that they can read files
+  in the new format. 
 
 @par
 Houdini:
@@ -69,9 +80,10 @@ Houdini:
 - Added a Divide operation to the Combine SOP.
 - Added support for boolean grids to the Combine, Resample, Scatter, Prune
   and Visualize SOPs.
-- The Fill SOP now allows the fill region bounds to be specified either in
-  index space (as before), in world space, or using the bounds of geometry
-  connected to an optional new reference input.
+- The Fill SOP now accepts a vector as the fill value, and it allows
+  the fill region bounds to be specified either in index space (as before),
+  in world space, or using the bounds of geometry connected to an optional
+  new reference input.
 - Added a toggle to the Offset Level Set SOP to specify the offset in
   either world or voxel units.
 - Added a toggle to the Transform and Resample SOPs to apply the transform

openvdb/io/Compression.h

@@ -86,7 +86,8 @@ enum {
     /*2*/ NO_MASK_AND_ONE_INACTIVE_VAL, // all inactive vals have the same non-background val
     /*3*/ MASK_AND_NO_INACTIVE_VALS,    // mask selects between -background and +background
     /*4*/ MASK_AND_ONE_INACTIVE_VAL,    // mask selects between backgd and one other inactive val
-    /*5*/ MASK_AND_TWO_INACTIVE_VALS    // mask selects between two non-background inactive vals
+    /*5*/ MASK_AND_TWO_INACTIVE_VALS,   // mask selects between two non-background inactive vals
+    /*6*/ NO_MASK_AND_ALL_VALS          // > 2 inactive vals, so no mask compression at all
 };
 
 
@@ -282,7 +283,7 @@ readCompressedValues(std::istream& is, ValueT* destBuf, Index destCount,
         zipped = compression & COMPRESS_ZIP,
         maskCompressed = compression & COMPRESS_ACTIVE_MASK;
 
-    int8_t metadata = NO_MASK_OR_INACTIVE_VALS;
+    int8_t metadata = NO_MASK_AND_ALL_VALS;
     if (getFormatVersion(is) >= OPENVDB_FILE_VERSION_NODE_MASK_COMPRESSION) {
         // Read the flag that specifies what, if any, additional metadata
         // (selection mask and/or inactive value(s)) is saved.
@@ -297,9 +298,9 @@ readCompressedValues(std::istream& is, ValueT* destBuf, Index destCount,
     ValueT inactiveVal0 =
         ((metadata == NO_MASK_OR_INACTIVE_VALS) ? background : math::negative(background));
 
-    if (metadata != NO_MASK_OR_INACTIVE_VALS &&
-        metadata != NO_MASK_AND_MINUS_BG &&
-        metadata != MASK_AND_NO_INACTIVE_VALS)
+    if (metadata == NO_MASK_AND_ONE_INACTIVE_VAL ||
+        metadata == MASK_AND_ONE_INACTIVE_VAL ||
+        metadata == MASK_AND_TWO_INACTIVE_VALS)
     {
         // Read one of at most two distinct inactive values.
         is.read(reinterpret_cast<char*>(&inactiveVal0), sizeof(ValueT));
@@ -310,9 +311,9 @@ readCompressedValues(std::istream& is, ValueT* destBuf, Index destCount,
     }
 
     MaskT selectionMask;
-    if (metadata != NO_MASK_OR_INACTIVE_VALS &&
-        metadata != NO_MASK_AND_MINUS_BG &&
-        metadata != NO_MASK_AND_ONE_INACTIVE_VAL)
+    if (metadata == MASK_AND_NO_INACTIVE_VALS ||
+        metadata == MASK_AND_ONE_INACTIVE_VAL ||
+        metadata == MASK_AND_TWO_INACTIVE_VALS)
     {
         // For use in mask compression (only), read the bitmask that selects
         // between two distinct inactive values.
@@ -323,7 +324,9 @@ readCompressedValues(std::istream& is, ValueT* destBuf, Index destCount,
     boost::scoped_array<ValueT> scopedTempBuf;
 
     Index tempCount = destCount;
-    if (maskCompressed && getFormatVersion(is) >= OPENVDB_FILE_VERSION_NODE_MASK_COMPRESSION) {
+    if (maskCompressed && metadata != NO_MASK_AND_ALL_VALS
+        && getFormatVersion(is) >= OPENVDB_FILE_VERSION_NODE_MASK_COMPRESSION)
+    {
         tempCount = valueMask.countOn();
         if (tempCount != destCount) {
             // If this node has inactive voxels, allocate a temporary buffer
@@ -395,7 +398,7 @@ writeCompressedValues(std::ostream& os, ValueT* srcBuf, Index srcCount,
     ValueT* tempBuf = srcBuf;
     boost::scoped_array<ValueT> scopedTempBuf;
 
-    int8_t metadata = NO_MASK_OR_INACTIVE_VALS;
+    int8_t metadata = NO_MASK_AND_ALL_VALS;
 
     if (!maskCompress) {
         os.write(reinterpret_cast<const char*>(&metadata), /*bytes=*/1);
@@ -478,13 +481,15 @@ writeCompressedValues(std::ostream& os, ValueT* srcBuf, Index srcCount,
                     metadata = MASK_AND_ONE_INACTIVE_VAL;
                 }
             }
+        } else if (numUniqueInactiveVals > 2) {
+            metadata = NO_MASK_AND_ALL_VALS;
         }
 
         os.write(reinterpret_cast<const char*>(&metadata), /*bytes=*/1);
 
-        if (metadata != NO_MASK_OR_INACTIVE_VALS &&
-            metadata != NO_MASK_AND_MINUS_BG &&
-            metadata != MASK_AND_NO_INACTIVE_VALS)
+        if (metadata == NO_MASK_AND_ONE_INACTIVE_VAL ||
+            metadata == MASK_AND_ONE_INACTIVE_VAL ||
+            metadata == MASK_AND_TWO_INACTIVE_VALS)
         {
             if (!toHalf) {
                 // Write one of at most two distinct inactive values.
@@ -505,7 +510,7 @@ writeCompressedValues(std::ostream& os, ValueT* srcBuf, Index srcCount,
             }
         }
 
-        if (metadata == NO_MASK_OR_INACTIVE_VALS && numUniqueInactiveVals > 2) {
+        if (metadata == NO_MASK_AND_ALL_VALS) {
             // If there are more than two unique inactive values, the entire input buffer
             // needs to be saved (both active and inactive values).
             /// @todo Save the selection mask as long as most of the inactive values