Various improvements.

Author: OpenVDB-DevTeam

openvdb/CHANGES

@@ -2,11 +2,16 @@ OpenVDB Version History
 =======================
 
 Version 2.2.0 - In development
+    - Added documentation (in the Cookbook) on interpolation, e.g. BoxSamper, 
+      GridSampler and DualGridSampler.
     - Modified tools::DualGridSampler so it is more consistent with 
       tools::GridSampler.
+    - Added support to the Combine, Resample, Scatter, Prune and Visualize SOPs
+      for grids with values of type bool.
+    - Fixed build issue reported for clang 3.2.
 
- API changes:
-    - tools::DualGridSampler is not longer templated to the target grid type,
+    API changes:
+    - tools::DualGridSampler is no longer templated on the target grid type,
       and the ValueAccessor is now passed as an argument.
 
 Version 2.1.0 - December 12, 2013

openvdb/doc/changes.txt

@@ -6,14 +6,19 @@
 @htmlonly <a name="v2_2_0_changes"></a>@endhtmlonly
 @par
 <B>Version 2.2.0</B> - <I>In development</I>
+- Added documentation (in the Cookbook) on interpolation, e.g. BoxSamper, 
+  GridSampler and DualGridSampler.
 - Modified @vdblink::tools::DualGridSampler DualGridSampler@endlink so 
-it is more consistent with @vdblink::tools::GridSampler GridSampler@endlink.
+  it is more consistent with @vdblink::tools::GridSampler GridSampler@endlink.
+- Added support to the Combine, Resample, Scatter, Prune and Visualize SOPs
+  for grids with values of type bool.
+- Fixed build issue reported for clang 3.2.
 
 @par
 API changes:
 - @vdblink::tools::DualGridSampler DualGridSampler@endlink is no longer 
-templated to the target grid type, and the ValueAccessor is now passed 
-as an argument.
+  templated on the target grid type, and the ValueAccessor is now passed 
+  as an argument.
 
 @htmlonly <a name="v2_1_0_changes"></a>@endhtmlonly
 @par

openvdb/tools/GridOperators.h

@@ -36,7 +36,7 @@
 #ifndef OPENVDB_TOOLS_GRID_OPERATORS_HAS_BEEN_INCLUDED
 #define OPENVDB_TOOLS_GRID_OPERATORS_HAS_BEEN_INCLUDED
 
-#include <openvdb/Grid.h>
+#include <openvdb/openvdb.h>// for BoolGrid
 #include <openvdb/math/Operators.h>
 #include <openvdb/util/NullInterrupter.h>
 #include <openvdb/tree/LeafManager.h>

openvdb/tree/LeafNodeBool.h

@@ -641,11 +641,11 @@ class LeafNode<bool, Log2Dim>
     };
 
 public:
-    typedef ValueIter<MaskOnIter, LeafNode, bool>                 ValueOnIter;
+    typedef ValueIter<MaskOnIter, LeafNode, const bool>           ValueOnIter;
     typedef ValueIter<MaskOnIter, const LeafNode, const bool>     ValueOnCIter;
-    typedef ValueIter<MaskOffIter, LeafNode, bool>                ValueOffIter;
+    typedef ValueIter<MaskOffIter, LeafNode, const bool>          ValueOffIter;
     typedef ValueIter<MaskOffIter, const LeafNode, const bool>    ValueOffCIter;
-    typedef ValueIter<MaskDenseIter, LeafNode, bool>              ValueAllIter;
+    typedef ValueIter<MaskDenseIter, LeafNode, const bool>        ValueAllIter;
     typedef ValueIter<MaskDenseIter, const LeafNode, const bool>  ValueAllCIter;
     typedef ChildIter<MaskOnIter, LeafNode>                       ChildOnIter;
     typedef ChildIter<MaskOnIter, const LeafNode>                 ChildOnCIter;
@@ -1497,9 +1497,9 @@ LeafNode<bool, Log2Dim>::visitActiveBBox(BBoxOp& op) const
     if (op.template descent<LEVEL>()) {
         for (ValueOnCIter i=this->cbeginValueOn(); i; ++i) {
 #ifdef _MSC_VER
-            op.operator()<LEVEL>(CoordBBox(i.getCoord(),1));
+            op.operator()<LEVEL>(CoordBBox::createCube(i.getCoord(), 1));
 #else
-            op.template operator()<LEVEL>(CoordBBox(i.getCoord(),1));
+            op.template operator()<LEVEL>(CoordBBox::createCube(i.getCoord(), 1));
 #endif
         }
     } else {

openvdb_houdini/houdini/SOP_OpenVDB_Combine.cc

@@ -409,9 +409,15 @@ SOP_OpenVDB_Combine::cookMySop(OP_Context& context)
             UT_String aGridName = aIt.getPrimitiveName(/*default=*/"A");
             UT_String bGridName = bIt.getPrimitiveName(/*default=*/"B");
 
+            // Name the output grid after the A grid, except (see below) if the A grid is unused.
+            UT_String outGridName = aIt.getPrimitiveName();
+
             hvdb::GridPtr outGrid;
 
             while (true) {
+                // If the A grid is unused, name the output grid after the most recent B grid.
+                if (!needA) outGridName = bIt.getPrimitiveName();
+
                 outGrid = combineGrids(op, aGrid, bGrid, aGridName, bGridName, resample);
 
                 // When not flattening, quit after one pass.
@@ -432,9 +438,7 @@ SOP_OpenVDB_Combine::cookMySop(OP_Context& context)
             if (outGrid) {
                 // Add a new VDB primitive for the output grid to the output gdp.
                 GU_PrimVDB::buildFromGrid(*gdp, outGrid,
-                    /*copyAttrsFrom=*/needA ? aVdb : bVdb,
-                    /*copyGridNameFrom=*/needA ? aGridName.toStdString().c_str()
-                        : bGridName.toStdString().c_str());
+                    /*copyAttrsFrom=*/needA ? aVdb : bVdb, outGridName);
 
                 // Remove the A grid from the output gdp.
                 if (aVdb) gdp->destroyPrimitive(*aVdb, /*andPoints=*/true);
@@ -923,7 +927,8 @@ SOP_OpenVDB_Combine::combineGrids(Operation op,
     compOp.bGridName = bGridName;
     compOp.interrupt = hvdb::Interrupter();
 
-    int success = UTvdbProcessTypedGrid(UTvdbGetGridType(needA ? *aGrid : *bGrid), aGrid, compOp);
+    int success = UTvdbProcessTypedGridTopology(
+        UTvdbGetGridType(needA ? *aGrid : *bGrid), aGrid, compOp);
     if (!success || !compOp.outGrid) {
         std::ostringstream ostr;
         ostr << "grids " << aGridName << " and " << bGridName

openvdb_houdini/houdini/SOP_OpenVDB_Fill.cc

@@ -150,7 +150,7 @@ SOP_OpenVDB_Fill::cookMySop(OP_Context& context)
             }
 
             GU_PrimVDB* vdbPrim = *it;
-            GEOvdbProcessTypedGrid(*vdbPrim, fillOp);
+            GEOvdbProcessTypedGridTopology(*vdbPrim, fillOp);
         }
     } catch (std::exception& e) {
         addError(SOP_MESSAGE, e.what());

openvdb_houdini/houdini/SOP_OpenVDB_Prune.cc

@@ -207,7 +207,7 @@ SOP_OpenVDB_Prune::cookMySop(OP_Context& context)
             }
 
             GU_PrimVDB* vdbPrim = *it;
-            GEOvdbProcessTypedGrid(*vdbPrim, pruneOp);
+            GEOvdbProcessTypedGridTopology(*vdbPrim, pruneOp);
         }
     } catch (std::exception& e) {
         addError(SOP_MESSAGE, e.what());

openvdb_houdini/houdini/SOP_OpenVDB_Resample.cc

@@ -412,13 +412,13 @@ SOP_OpenVDB_Resample::cookMySop(OP_Context& context)
 
                     if (samplingOrder == 0) {
                         hvdb::GridResampleToMatchOp<openvdb::tools::PointSampler> op(outGrid);
-                        GEOvdbProcessTypedGrid(*vdb, op);
+                        GEOvdbProcessTypedGridTopology(*vdb, op);
                     } else if (samplingOrder == 1) {
                         hvdb::GridResampleToMatchOp<openvdb::tools::BoxSampler> op(outGrid);
-                        GEOvdbProcessTypedGrid(*vdb, op);
+                        GEOvdbProcessTypedGridTopology(*vdb, op);
                     } else if (samplingOrder == 2) {
                         hvdb::GridResampleToMatchOp<openvdb::tools::QuadraticSampler> op(outGrid);
-                        GEOvdbProcessTypedGrid(*vdb, op);
+                        GEOvdbProcessTypedGridTopology(*vdb, op);
                     }
                 }
 
@@ -452,13 +452,13 @@ SOP_OpenVDB_Resample::cookMySop(OP_Context& context)
 
                     if (samplingOrder == 0) {
                         hvdb::GridTransformOp<openvdb::tools::PointSampler> op(outGrid, xform);
-                        GEOvdbProcessTypedGrid(*vdb, op);
+                        GEOvdbProcessTypedGridTopology(*vdb, op);
                     } else if (samplingOrder == 1) {
                         hvdb::GridTransformOp<openvdb::tools::BoxSampler> op(outGrid, xform);
-                        GEOvdbProcessTypedGrid(*vdb, op);
+                        GEOvdbProcessTypedGridTopology(*vdb, op);
                     } else if (samplingOrder == 2) {
                         hvdb::GridTransformOp<openvdb::tools::QuadraticSampler> op(outGrid, xform);
-                        GEOvdbProcessTypedGrid(*vdb, op);
+                        GEOvdbProcessTypedGridTopology(*vdb, op);
                     }
                 }
             }

openvdb_houdini/houdini/SOP_OpenVDB_Scatter.cc

@@ -352,7 +352,7 @@ SOP_OpenVDB_Scatter::cookMySop(OP_Context& context)
                     if (interior && isSignedDistance) {
                         processLSInterior(gridType, grid, scatter);
                     } else {
-                        UTvdbProcessTypedGrid(gridType, grid, scatter);
+                        UTvdbProcessTypedGridTopology(gridType, grid, scatter);
                     }
 
                     if (verbose) scatter.print(gridName);
@@ -371,7 +371,7 @@ SOP_OpenVDB_Scatter::cookMySop(OP_Context& context)
                 if (interior && isSignedDistance) {
                     processLSInterior(gridType, grid, scatter);
                 } else {
-                    UTvdbProcessTypedGrid(gridType, grid, scatter);
+                    UTvdbProcessTypedGridTopology(gridType, grid, scatter);
                 }
 
                 if (verbose) scatter.print(gridName);

openvdb_houdini/houdini/SOP_OpenVDB_Visualize.cc

@@ -888,7 +888,7 @@ SOP_OpenVDB_Visualize::cookMySop(OP_Context& context)
                     VDBTopologyVisualizer draw(*gdp, nodeOptions, tileOptions,
                         voxelOptions, ignorestaggered, &boss);
 
-                    GEOvdbProcessTypedGrid(*vdb, draw);
+                    GEOvdbProcessTypedGridTopology(*vdb, draw);
                 }
 
                 if (showFrustum) {