Merge pull request #1750 from sideeffects/sendupstream_reference_dir

jmlait · web-flow · commit eaaa68f2a353 · 2024-01-17T11:48:57.000-05:00
Move the pure-reference files, GU_PrimVDB and GEO_PrimVDB, to a reference directory
diff --git a/openvdb_houdini/openvdb_houdini/CMakeLists.txt b/openvdb_houdini/openvdb_houdini/CMakeLists.txt
@@ -160,10 +160,8 @@ set(OPENVDB_HOUDINI_LOCAL_DIR ${PROJECT_BINARY_DIR}/openvdb_houdini)
 file(MAKE_DIRECTORY ${OPENVDB_HOUDINI_LOCAL_DIR})
 file(COPY
     AttributeTransferUtil.h
-    GEO_PrimVDB.h
     GeometryUtil.h
     GT_GEOPrimCollectVDB.h
-    GU_PrimVDB.h
     GU_VDBPointTools.h
     PointUtils.h
     SOP_NodeVDB.h
@@ -176,12 +174,10 @@ file(COPY
 )
 
 add_library(openvdb_houdini SHARED
-  GEO_PrimVDB.cc
   GEO_VDBTranslator.cc
   geometry.cc
   GeometryUtil.cc
   GT_GEOPrimCollectVDB.cc
-  GU_PrimVDB.cc
   GU_VDBPointTools.cc
   ParmFactory.cc
   PointUtils.cc
diff --git a/openvdb_houdini/openvdb_houdini/GEO_VDBTranslator.cc b/openvdb_houdini/openvdb_houdini/GEO_VDBTranslator.cc
@@ -6,7 +6,7 @@
  *      Side Effects Software Inc.  All rights reserved.
  */
 
-#include "GU_PrimVDB.h"
+#include <GU/GU_PrimVDB.h>
 #include "Utils.h"
 
 #include <UT/UT_EnvControl.h>
diff --git a/openvdb_houdini/openvdb_houdini/GT_GEOPrimCollectVDB.cc b/openvdb_houdini/openvdb_houdini/GT_GEOPrimCollectVDB.cc
@@ -26,7 +26,7 @@
 #include <GT/GT_PrimCurveMesh.h>
 #include <GU/GU_DetailHandle.h>
 
-#include "GEO_PrimVDB.h"
+#include <GEO/GEO_PrimVDB.h>
 #include <UT/UT_ParallelUtil.h>
 #include <UT/UT_Vector3.h>
 #include <UT/UT_Version.h>
diff --git a/openvdb_houdini/openvdb_houdini/SOP_NodeVDB.cc b/openvdb_houdini/openvdb_houdini/SOP_NodeVDB.cc
@@ -10,8 +10,8 @@
 #include <openvdb/points/PointDataGrid.h>
 #include "PointUtils.h"
 #include "Utils.h"
-#include "GEO_PrimVDB.h"
-#include "GU_PrimVDB.h"
+#include <GEO/GEO_PrimVDB.h>
+#include <GU/GU_PrimVDB.h>
 #include <GU/GU_Detail.h>
 #include <GU/GU_PrimPoly.h>
 #include <OP/OP_NodeInfoParms.h>
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_From_Particles.cc b/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_From_Particles.cc
@@ -1105,7 +1105,7 @@ SOP_OpenVDB_From_Particles::Cache::cookVDBSop(OP_Context& context)
         if (refGeo && (0 != evalInt("usereferencevdb", 0, time))) {
             const auto refName = evalStdString("referencevdb", time);
             hvdb::VdbPrimCIterator it(refGeo, matchGroup(*refGeo, refName));
-            if (const hvdb::GU_PrimVDB* refPrim = (it ? *it : nullptr)) {
+            if (const GU_PrimVDB* refPrim = (it ? *it : nullptr)) {
                 refGrid = refPrim->getGridPtr();
             } else {
                 addError(SOP_MESSAGE,
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Merge.cc b/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Merge.cc
@@ -11,7 +11,7 @@
 #include <openvdb_houdini/Utils.h>
 #include <openvdb_houdini/PointUtils.h>
 #include <openvdb_houdini/SOP_NodeVDB.h>
-#include <openvdb_houdini/GEO_PrimVDB.h>
+#include <GEO/GEO_PrimVDB.h>
 
 #include <openvdb/points/PointDataGrid.h> // points::PointDataGrid
 #include <openvdb/tools/GridTransformer.h> // tools::replaceToMatch()
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Points_Convert.cc b/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Points_Convert.cc
@@ -615,7 +615,7 @@ SOP_OpenVDB_Points_Convert::Cache::cookVDBSop(OP_Context& context)
                     matchGroup(*refGeo, evalStdString("refvdb", time));
 
                 hvdb::VdbPrimCIterator it(refGeo, refGroup);
-                const hvdb::GU_PrimVDB* refPrim = *it;
+                const GU_PrimVDB* refPrim = *it;
 
                 if (!refPrim) {
                     addError(SOP_MESSAGE, "Second input has no VDB primitives.");
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Read.cc b/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Read.cc
@@ -8,8 +8,8 @@
 #include <houdini_utils/ParmFactory.h>
 #include <openvdb_houdini/Utils.h>
 #include <openvdb_houdini/SOP_NodeVDB.h>
-#include <openvdb_houdini/GEO_PrimVDB.h>
-#include <openvdb_houdini/GU_PrimVDB.h>
+#include <GEO/GEO_PrimVDB.h>
+#include <GU/GU_PrimVDB.h>
 #include <UT/UT_Interrupt.h>
 #include <cctype>
 #include <stdexcept>
diff --git a/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Write.cc b/openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Write.cc
@@ -8,8 +8,8 @@
 #include <houdini_utils/ParmFactory.h>
 #include <openvdb_houdini/Utils.h>
 #include <openvdb_houdini/SOP_NodeVDB.h>
-#include <openvdb_houdini/GEO_PrimVDB.h>
-#include <openvdb_houdini/GU_PrimVDB.h>
+#include <GEO/GEO_PrimVDB.h>
+#include <GU/GU_PrimVDB.h>
 #include <PRM/PRM_Parm.h>
 #include <UT/UT_Interrupt.h>
 #include <set>
diff --git a/openvdb_houdini/openvdb_houdini/Utils.cc b/openvdb_houdini/openvdb_houdini/Utils.cc
@@ -8,7 +8,7 @@
 #include "Utils.h"
 
 #include <houdini_utils/ParmFactory.h>
-#include "GEO_PrimVDB.h"
+#include <GEO/GEO_PrimVDB.h>
 #include <GU/GU_Detail.h>
 #include <UT/UT_String.h>
 #include <UT/UT_Version.h>
diff --git a/openvdb_houdini/openvdb_houdini/Utils.h b/openvdb_houdini/openvdb_houdini/Utils.h
@@ -8,7 +8,7 @@
 #ifndef OPENVDB_HOUDINI_UTILS_HAS_BEEN_INCLUDED
 #define OPENVDB_HOUDINI_UTILS_HAS_BEEN_INCLUDED
 
-#include "GU_PrimVDB.h"
+#include <GU/GU_PrimVDB.h>
 #include <OP/OP_Node.h> // for OP_OpTypeId
 #include <UT/UT_SharedPtr.h>
 #include <UT/UT_Interrupt.h>
diff --git a/openvdb_houdini/openvdb_houdini/reference/GEO_PrimVDB.cc b/openvdb_houdini/openvdb_houdini/reference/GEO_PrimVDB.cc
diff --git a/openvdb_houdini/openvdb_houdini/reference/GEO_PrimVDB.h b/openvdb_houdini/openvdb_houdini/reference/GEO_PrimVDB.h
@@ -17,10 +17,13 @@
  */
 
 
-// Using the native OpenVDB Primitive shipped with Houdini is strongly recommended,
-// as there is no guarantee that this code will be kept in sync with Houdini.
-// However, for debugging it can be useful, so supply -DSESI_OPENVDB_PRIM to
-// the compiler to build this custom primitive.
+// Using the native OpenVDB Primitive shipped with Houdini is strongly
+// recommended, as there is no guarantee that this code will be kept in sync
+// with Houdini.
+// This code is provided to help ensure algorithms in the provided SOPs
+// can be re-implemented by revealing the otherwise the hidden implementations.
+// It is possible to replace Houdini's GU_PrimVDB with this, but no
+// official support for that remains.
 
 #if !defined(SESI_OPENVDB) && !defined(SESI_OPENVDB_PRIM)
 
diff --git a/openvdb_houdini/openvdb_houdini/reference/GU_PrimVDB.cc b/openvdb_houdini/openvdb_houdini/reference/GU_PrimVDB.cc
diff --git a/openvdb_houdini/openvdb_houdini/reference/GU_PrimVDB.h b/openvdb_houdini/openvdb_houdini/reference/GU_PrimVDB.h
@@ -18,10 +18,13 @@
 
 #include <UT/UT_Version.h>
 
-// Using the native OpenVDB Primitive shipped with Houdini is strongly recommended,
-// as there is no guarantee that this code will be kept in sync with Houdini.
-// However, for debugging it can be useful, so supply -DSESI_OPENVDB_PRIM to
-// the compiler to build this custom primitive.
+// Using the native OpenVDB Primitive shipped with Houdini is strongly
+// recommended, as there is no guarantee that this code will be kept in sync
+// with Houdini.
+// This code is provided to help ensure algorithms in the provided SOPs
+// can be re-implemented by revealing the otherwise the hidden implementations.
+// It is possible to replace Houdini's GU_PrimVDB with this, but no
+// official support for that remains.
 
 #if !defined(SESI_OPENVDB) && !defined(SESI_OPENVDB_PRIM)
 
