less ambiguous namespace

less ambiguous namespace Signed-off-by: ghurstunither <[email protected]>
ghurstunither · Oct 11, 2024 · dd5e76b · dd5e76b
1 parent a1b2710
commit dd5e76b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/openvdb/openvdb/tools/ConvexVoxelizer.h b/openvdb/openvdb/tools/ConvexVoxelizer.h
@@ -34,7 +34,7 @@ OPENVDB_USE_VERSION_NAMESPACE
 namespace OPENVDB_VERSION_NAME {
 namespace tools {
 
-namespace internal {
+namespace lvlset {
 
 /// @brief Internal class used by derived @c ConvexVoxelizer classes that make use of PointPartitioner.
 template<typename VectorType>
@@ -61,7 +61,7 @@ struct PointArray
 
 }; // struct PointArray
 
-} // namespace internal
+} // namespace lvlset
 
 /// @brief Base class used to generate a grid of type @c GridType containing a narrow-band level set
 /// representation of a convex region.

diff --git a/openvdb/openvdb/tools/LevelSetThickenedMesh.h b/openvdb/openvdb/tools/LevelSetThickenedMesh.h
@@ -67,7 +67,7 @@ createLevelSetThickenedMesh(
     const std::vector<Vec3s>& vertices, const std::vector<Vec3I>& triangles,
     float radius, float voxelSize, float halfWidth);
 
-namespace internal {
+namespace lvlset {
 
 /// @brief Class used to generate a grid of type @c GridType containing a narrow-band level set
 /// representation of an _open_ prism.
@@ -1211,7 +1211,7 @@ class ThickenedMeshVoxelizer {
     inline void
     voxelizeTube(const Vec3s& p1, const Vec3s& p2, const Vec3s& p3)
     {
-        internal::CapsuleVoxelizer<GridT, InterruptT> voxelizer(mGrid, false);
+        lvlset::CapsuleVoxelizer<GridT, InterruptT> voxelizer(mGrid, false);
 
         float d1 = (p2-p1).lengthSqr(),
               d2 = (p3-p2).lengthSqr(),
@@ -1357,7 +1357,7 @@ class ThickenedMeshVoxelizer {
         std::vector<Vec3s> centroids;
         computeCentroids(centroids);
 
-        internal::PointArray<Vec3s> points(centroids);
+        lvlset::PointArray<Vec3s> points(centroids);
 
         mPtPartitioner = std::make_shared<PartitionerT>();
         mPtPartitioner->construct(points, mGrid->transform());
@@ -1389,7 +1389,7 @@ class ThickenedMeshVoxelizer {
 
 }; // class ThickenedMeshVoxelizer
 
-} // namespace internal
+} // namespace lvlset
 
 
 // ------------ createLevelSetThickenedMesh ------------- //
@@ -1404,7 +1404,7 @@ createLevelSetThickenedMesh(InterruptT& interrupter,
     using TreeT = typename GridType::TreeType;
     using ValueT = typename GridType::ValueType;
 
-    using Voxelizer = typename internal::ThickenedMeshVoxelizer<GridType, InterruptT>;
+    using Voxelizer = typename lvlset::ThickenedMeshVoxelizer<GridType, InterruptT>;
 
     static_assert(std::is_floating_point<ValueT>::value,
         "createLevelSetThickenedMesh must return a scalar grid");

diff --git a/openvdb/openvdb/tools/LevelSetTubes.h b/openvdb/openvdb/tools/LevelSetTubes.h
@@ -201,7 +201,7 @@ createLevelSetTubeComplex(const std::vector<Vec3s>& vertices, const std::vector<
 ////////////////////////////////////////
 
 
-namespace internal {
+namespace lvlset {
 
 /// @brief Class used to generate a grid of type @c GridType containing a narrow-band level set
 /// representation of a capsule.
@@ -1266,7 +1266,7 @@ class TubeComplexVoxelizer {
         std::vector<Vec3s> centroids;
         computeCentroids(centroids);
 
-        internal::PointArray<Vec3s> points(centroids);
+        lvlset::PointArray<Vec3s> points(centroids);
 
         mPtPartitioner = std::make_shared<PartitionerT>();
         mPtPartitioner->construct(points, mGrid->transform());
@@ -1299,7 +1299,7 @@ class TubeComplexVoxelizer {
 
 }; // class TubeComplexVoxelizer
 
-} // namespace internal
+} // namespace lvlset
 
 
 // ------------ createLevelSetTubeComplex ------------- //
@@ -1316,7 +1316,7 @@ createLevelSetTubeComplex(InterruptT& interrupter,
     using TreeT = typename GridType::TreeType;
     using ValueT = typename GridType::ValueType;
 
-    using ComplexVoxelizer = typename internal::TubeComplexVoxelizer<GridType, InterruptT>;
+    using ComplexVoxelizer = typename lvlset::TubeComplexVoxelizer<GridType, InterruptT>;
 
     static_assert(std::is_floating_point<ValueT>::value,
         "createLevelSetTubeComplex must return a scalar grid");
@@ -1361,8 +1361,8 @@ createLevelSetTubeComplex(InterruptT& interrupter,
     using TreeT = typename GridType::TreeType;
     using ValueT = typename GridType::ValueType;
 
-    using CapsuleComplexVoxelizer = typename internal::TubeComplexVoxelizer<GridType, InterruptT, true>;
-    using RoundConeComplexVoxelizer = typename internal::TubeComplexVoxelizer<GridType, InterruptT, false>;
+    using CapsuleComplexVoxelizer = typename lvlset::TubeComplexVoxelizer<GridType, InterruptT, true>;
+    using RoundConeComplexVoxelizer = typename lvlset::TubeComplexVoxelizer<GridType, InterruptT, false>;
 
     static_assert(std::is_floating_point<ValueT>::value,
         "createLevelSetTubeComplex must return a scalar grid");
@@ -1443,7 +1443,7 @@ createLevelSetCapsule(InterruptT& interrupter, const Vec3s& pt1, const Vec3s& pt
     using GridPtr = typename GridType::Ptr;
     using ValueT = typename GridType::ValueType;
 
-    using CapsuleVoxelizer = typename internal::CapsuleVoxelizer<GridType, InterruptT>;
+    using CapsuleVoxelizer = typename lvlset::CapsuleVoxelizer<GridType, InterruptT>;
 
     static_assert(std::is_floating_point<ValueT>::value,
         "createLevelSetCapsule must return a scalar grid");
@@ -1487,8 +1487,8 @@ createLevelSetRoundCone(InterruptT& interrupter, const Vec3s& pt1, const Vec3s&
     using GridPtr = typename GridType::Ptr;
     using ValueT = typename GridType::ValueType;
 
-    using CapsuleVoxelizer = typename internal::CapsuleVoxelizer<GridType, InterruptT>;
-    using RoundConeVoxelizer = typename internal::RoundConeVoxelizer<GridType, InterruptT>;
+    using CapsuleVoxelizer = typename lvlset::CapsuleVoxelizer<GridType, InterruptT>;
+    using RoundConeVoxelizer = typename lvlset::RoundConeVoxelizer<GridType, InterruptT>;
 
     static_assert(std::is_floating_point<ValueT>::value,
         "createLevelSetRoundCone must return a scalar grid");