Added check for channel count during compression (#101)

Author: Devaniti

.github/workflows/build-custom.yml

@@ -104,6 +104,7 @@ jobs:
   merge-packages:
     runs-on: macos-14
     needs: [select-houdini-build, build-plugin]
+    if: ${{ fromJson(needs.select-houdini-build.outputs.build-matrix-json).include.length > 1 }}
     name: Merge packages
 
     steps:

.github/workflows/build.yml

@@ -124,6 +124,8 @@ jobs:
   merge-packages:
     runs-on: macos-14
     needs: [select-houdini-build, build-plugin]
+    # Only run merge if there is more than one build in matrix
+    if: ${{ fromJson(needs.select-houdini-build.outputs.build-matrix-json).include[1] != null }}
     name: Merge packages ${{ github.event_name == 'pull_request' && '(PR)' || ' (Push)' }}
 
     steps:

src/ROP/ROP_ZibraVDBCompressor.cpp

@@ -375,22 +375,42 @@ namespace Zibra::ZibraVDBCompressor
         }
 
         m_OrderedChannelNames.clear();
+        m_CurrentChannelCount = 0;
         m_OrderedChannelNames.reserve(8);
         const GEO_Primitive* prim;
         GA_FOR_ALL_PRIMITIVES(gdp, prim)
         {
             if (prim->getTypeId() == GEO_PRIMVDB)
             {
-                auto vdbPrim = dynamic_cast<const GEO_PrimVDB*>(prim);
-                auto gridName = vdbPrim->getGridName();
-                if (m_OrderedChannelNames.size() >= 8)
+                const GEO_PrimVDB* vdbPrim = dynamic_cast<const GEO_PrimVDB*>(prim);
+                const char* gridName = vdbPrim->getGridName();
+                const openvdb::GridBase& baseGrid = vdbPrim->getConstGrid();
+
+                int underlyingChannels = 0;
+
+                if (baseGrid.baseTree().isType<openvdb::Vec3STree>())
+                {
+                    underlyingChannels = 3;
+                }
+                else if (baseGrid.baseTree().isType<openvdb::FloatTree>())
+                {
+                    underlyingChannels = 1;
+                }
+                else
+                {
+                    std::string m = "Grid "s + gridName + " has unsupported grid type.";
+                    addError(ROP_MESSAGE, m.c_str());
+                    return ROP_ABORT_RENDER;
+                }
+
+                if (m_CurrentChannelCount + underlyingChannels > CE::MAX_CHANNEL_COUNT)
                 {
-                    std::string m = "Input has quantity of VDB primitives greater than 8 supported. Skipping '"s + gridName + "'.";
+                    std::string m = "Can not compress more than " + std::to_string(CE::MAX_CHANNEL_COUNT) + " channels.";
                     addError(ROP_MESSAGE, m.c_str());
-                    break;
+                    return ROP_ABORT_RENDER;
                 }
 
-                const auto voxelSize = openvdb::Vec3f(vdbPrim->getGrid().voxelSize());
+                const auto voxelSize = openvdb::Vec3f(baseGrid.voxelSize());
                 const auto hasUniformVoxelSize = (std::abs(voxelSize[0] - voxelSize[1]) < std::numeric_limits<float>::epsilon()) &&
                                                  (std::abs(voxelSize[1] - voxelSize[2]) < std::numeric_limits<float>::epsilon());
                 if (!hasUniformVoxelSize)
@@ -400,6 +420,7 @@ namespace Zibra::ZibraVDBCompressor
                     return ROP_ABORT_RENDER;
                 }
                 m_OrderedChannelNames.emplace_back(gridName);
+                m_CurrentChannelCount += underlyingChannels;
             }
         }
 
@@ -456,22 +477,35 @@ namespace Zibra::ZibraVDBCompressor
         {
             if (prim->getTypeId() == GEO_PRIMVDB)
             {
-                auto vdbPrim = dynamic_cast<const GEO_PrimVDB*>(prim);
+                const GEO_PrimVDB* vdbPrim = dynamic_cast<const GEO_PrimVDB*>(prim);
                 const char* gridName = vdbPrim->getGridName();
-                if (channelNamesUniqueStorage.find(gridName) != channelNamesUniqueStorage.cend())
+                const openvdb::GridBase::ConstPtr baseGrid = vdbPrim->getConstGridPtr();
+
+                int underlyingChannels = 0;
+
+                if (baseGrid->baseTree().isType<openvdb::Vec3STree>())
                 {
-                    std::string m = "ZibraVDB uses grid name as unique key. Node input contains duplicate of '"s + gridName + "' VDB prim.";
+                    underlyingChannels = 3;
+                }
+                else if (baseGrid->baseTree().isType<openvdb::FloatTree>())
+                {
+                    underlyingChannels = 1;
+                }
+                else
+                {
+                    std::string m = "Grid "s + gridName + " has unsupported grid type.";
                     addError(ROP_MESSAGE, m.c_str());
                     return ROP_ABORT_RENDER;
                 }
-                if (vdbPrim->getStorageType() != UT_VDB_FLOAT && vdbPrim->getStorageType() != UT_VDB_VEC3F)
+
+                if (channelNamesUniqueStorage.find(gridName) != channelNamesUniqueStorage.cend())
                 {
-                    std::string m = "Unsupported value type for '"s + gridName + "' prim. Only float grids supported.";
+                    std::string m = "ZibraVDB uses grid name as unique key. Node input contains duplicate of '"s + gridName + "' VDB prim.";
                     addError(ROP_MESSAGE, m.c_str());
                     return ROP_ABORT_RENDER;
                 }
 
-                const auto gridDimensions = vdbPrim->getGrid().evalActiveVoxelBoundingBox().dim();
+                const auto gridDimensions = baseGrid->evalActiveVoxelBoundingBox().dim();
                 constexpr size_t MAX_GRID_DIMENSION = 4096;
                 if (gridDimensions.x() > MAX_GRID_DIMENSION || gridDimensions.y() > MAX_GRID_DIMENSION ||
                     gridDimensions.z() > MAX_GRID_DIMENSION)
@@ -480,9 +514,23 @@ namespace Zibra::ZibraVDBCompressor
                     return ROP_ABORT_RENDER;
                 }
 
-                volumes.emplace_back(vdbPrim->getGridPtr());
+                volumes.emplace_back(std::move(baseGrid));
                 orderedChannelNames.push_back(gridName);
                 channelNamesUniqueStorage.insert(gridName);
+
+                auto iter = std::find(m_OrderedChannelNames.begin(), m_OrderedChannelNames.end(), gridName);
+                if (iter != m_OrderedChannelNames.end())
+                {
+                    if (m_CurrentChannelCount + underlyingChannels > CE::MAX_CHANNEL_COUNT)
+                    {
+                        std::string m = "Can not compress more than " + std::to_string(CE::MAX_CHANNEL_COUNT) + " channels.";
+                        addError(ROP_MESSAGE, m.c_str());
+                        return ROP_ABORT_RENDER;
+                    }
+
+                    m_OrderedChannelNames.emplace_back(gridName);
+                    m_CurrentChannelCount += underlyingChannels;
+                }
             }
         }
 

src/ROP/ROP_ZibraVDBCompressor.h

@@ -86,6 +86,7 @@ namespace Zibra::ZibraVDBCompressor
         SOP_Node* m_InputSOP = nullptr;
 
         std::vector<std::string> m_OrderedChannelNames{};
+        int m_CurrentChannelCount = 0;
 
         ContextType m_ContextType;