diff --git a/include/geode/inspector/criterion/private/colocation_impl.h b/include/geode/inspector/criterion/internal/colocation_impl.h similarity index 97% rename from include/geode/inspector/criterion/private/colocation_impl.h rename to include/geode/inspector/criterion/internal/colocation_impl.h index 9fa7a29b..83a800bc 100644 --- a/include/geode/inspector/criterion/private/colocation_impl.h +++ b/include/geode/inspector/criterion/internal/colocation_impl.h @@ -30,7 +30,7 @@ namespace geode { - namespace detail + namespace internal { /*! * Implementation of the inspection of the colocation of a Mesh @@ -50,5 +50,5 @@ namespace geode private: const Mesh& mesh_; }; - } // namespace detail + } // namespace internal } // namespace geode diff --git a/include/geode/inspector/criterion/private/component_meshes_adjacency.h b/include/geode/inspector/criterion/internal/component_meshes_adjacency.h similarity index 100% rename from include/geode/inspector/criterion/private/component_meshes_adjacency.h rename to include/geode/inspector/criterion/internal/component_meshes_adjacency.h diff --git a/include/geode/inspector/criterion/private/component_meshes_degeneration.h b/include/geode/inspector/criterion/internal/component_meshes_degeneration.h similarity index 100% rename from include/geode/inspector/criterion/private/component_meshes_degeneration.h rename to include/geode/inspector/criterion/internal/component_meshes_degeneration.h diff --git a/include/geode/inspector/criterion/private/component_meshes_manifold.h b/include/geode/inspector/criterion/internal/component_meshes_manifold.h similarity index 100% rename from include/geode/inspector/criterion/private/component_meshes_manifold.h rename to include/geode/inspector/criterion/internal/component_meshes_manifold.h diff --git a/include/geode/inspector/criterion/private/degeneration_impl.h b/include/geode/inspector/criterion/internal/degeneration_impl.h similarity index 97% rename from include/geode/inspector/criterion/private/degeneration_impl.h rename to include/geode/inspector/criterion/internal/degeneration_impl.h index 532ac18e..09abacc2 100644 --- a/include/geode/inspector/criterion/private/degeneration_impl.h +++ b/include/geode/inspector/criterion/internal/degeneration_impl.h @@ -28,7 +28,7 @@ namespace geode { - namespace detail + namespace internal { /*! * Implementation of the inspection of the degeneration of a Mesh @@ -54,5 +54,5 @@ namespace geode private: const Mesh& mesh_; }; - } // namespace detail + } // namespace internal } // namespace geode diff --git a/include/geode/inspector/topology/private/topology_helpers.h b/include/geode/inspector/topology/internal/topology_helpers.h similarity index 97% rename from include/geode/inspector/topology/private/topology_helpers.h rename to include/geode/inspector/topology/internal/topology_helpers.h index ccdf2a16..9ea33be6 100644 --- a/include/geode/inspector/topology/private/topology_helpers.h +++ b/include/geode/inspector/topology/internal/topology_helpers.h @@ -43,7 +43,7 @@ namespace geode namespace geode { - namespace detail + namespace internal { bool brep_blocks_are_meshed( const BRep& brep ); @@ -77,5 +77,5 @@ namespace geode const Section& section, const ComponentID& component_id, const VertexSet& component_mesh ); - } // namespace detail + } // namespace internal } // namespace geode \ No newline at end of file diff --git a/src/geode/inspector/CMakeLists.txt b/src/geode/inspector/CMakeLists.txt index e07bdeed..a1ac71c6 100644 --- a/src/geode/inspector/CMakeLists.txt +++ b/src/geode/inspector/CMakeLists.txt @@ -27,18 +27,18 @@ add_geode_library( "criterion/section_meshes_inspector.cpp" "criterion/adjacency/surface_adjacency.cpp" "criterion/adjacency/solid_adjacency.cpp" - "criterion/private/component_meshes_adjacency.cpp" + "criterion/internal/component_meshes_adjacency.cpp" "criterion/adjacency/section_meshes_adjacency.cpp" "criterion/adjacency/brep_meshes_adjacency.cpp" - "criterion/private/colocation_impl.cpp" + "criterion/internal/colocation_impl.cpp" "criterion/colocation/pointset_colocation.cpp" "criterion/colocation/edgedcurve_colocation.cpp" "criterion/colocation/surface_colocation.cpp" "criterion/colocation/solid_colocation.cpp" "criterion/colocation/unique_vertices_colocation.cpp" "criterion/colocation/component_meshes_colocation.cpp" - "criterion/private/degeneration_impl.cpp" - "criterion/private/component_meshes_degeneration.cpp" + "criterion/internal/degeneration_impl.cpp" + "criterion/internal/component_meshes_degeneration.cpp" "criterion/degeneration/edgedcurve_degeneration.cpp" "criterion/degeneration/surface_degeneration.cpp" "criterion/degeneration/solid_degeneration.cpp" @@ -52,7 +52,7 @@ add_geode_library( "criterion/manifold/solid_vertex_manifold.cpp" "criterion/manifold/solid_edge_manifold.cpp" "criterion/manifold/solid_facet_manifold.cpp" - "criterion/private/component_meshes_manifold.cpp" + "criterion/internal/component_meshes_manifold.cpp" "criterion/manifold/section_meshes_manifold.cpp" "criterion/manifold/brep_meshes_manifold.cpp" "topology/brep_topology.cpp" @@ -64,7 +64,7 @@ add_geode_library( "topology/section_corners_topology.cpp" "topology/section_lines_topology.cpp" "topology/section_surfaces_topology.cpp" - "topology/private/topology_helpers.cpp" + "topology/internal/topology_helpers.cpp" "section_inspector.cpp" "brep_inspector.cpp" "pointset_inspector.cpp" @@ -110,12 +110,12 @@ add_geode_library( "edgedcurve_inspector.h" "surface_inspector.h" "solid_inspector.h" - PRIVATE_HEADERS - "criterion/private/colocation_impl.h" - "criterion/private/component_meshes_adjacency.h" - "criterion/private/component_meshes_degeneration.h" - "criterion/private/component_meshes_manifold.h" - "criterion/private/degeneration_impl.h" + INTERNAL_HEADERS + "criterion/internal/colocation_impl.h" + "criterion/internal/component_meshes_adjacency.h" + "criterion/internal/component_meshes_degeneration.h" + "criterion/internal/component_meshes_manifold.h" + "criterion/internal/degeneration_impl.h" "topology/brep_corners_topology.h" "topology/brep_lines_topology.h" "topology/brep_surfaces_topology.h" @@ -123,7 +123,7 @@ add_geode_library( "topology/section_corners_topology.h" "topology/section_lines_topology.h" "topology/section_surfaces_topology.h" - "topology/private/topology_helpers.h" + "topology/internal/topology_helpers.h" PUBLIC_DEPENDENCIES OpenGeode::basic PRIVATE_DEPENDENCIES diff --git a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp index bb3dffd7..8cb4fab1 100644 --- a/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include namespace geode { diff --git a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp index 6082b4d8..50c7f3ee 100644 --- a/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp @@ -28,7 +28,7 @@ #include -#include +#include namespace geode { diff --git a/src/geode/inspector/criterion/colocation/edgedcurve_colocation.cpp b/src/geode/inspector/criterion/colocation/edgedcurve_colocation.cpp index 6a8a741c..f6d9f489 100644 --- a/src/geode/inspector/criterion/colocation/edgedcurve_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/edgedcurve_colocation.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -33,12 +33,12 @@ namespace geode { template < index_t dimension > class EdgedCurveColocation< dimension >::Impl - : public detail::ColocationImpl< dimension, EdgedCurve< dimension > > + : public internal::ColocationImpl< dimension, EdgedCurve< dimension > > { public: Impl( const EdgedCurve< dimension >& mesh ) - : detail::ColocationImpl< dimension, EdgedCurve< dimension > >( - mesh ) + : internal::ColocationImpl< dimension, EdgedCurve< dimension > >( + mesh ) { } }; diff --git a/src/geode/inspector/criterion/colocation/pointset_colocation.cpp b/src/geode/inspector/criterion/colocation/pointset_colocation.cpp index a5d9cf56..bf122cc8 100644 --- a/src/geode/inspector/criterion/colocation/pointset_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/pointset_colocation.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -33,11 +33,12 @@ namespace geode { template < index_t dimension > class PointSetColocation< dimension >::Impl - : public detail::ColocationImpl< dimension, PointSet< dimension > > + : public internal::ColocationImpl< dimension, PointSet< dimension > > { public: Impl( const PointSet< dimension >& mesh ) - : detail::ColocationImpl< dimension, PointSet< dimension > >( mesh ) + : internal::ColocationImpl< dimension, PointSet< dimension > >( + mesh ) { } }; diff --git a/src/geode/inspector/criterion/colocation/solid_colocation.cpp b/src/geode/inspector/criterion/colocation/solid_colocation.cpp index 292b093c..ba5db3a7 100644 --- a/src/geode/inspector/criterion/colocation/solid_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/solid_colocation.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -33,12 +33,12 @@ namespace geode { template < index_t dimension > class SolidMeshColocation< dimension >::Impl - : public detail::ColocationImpl< dimension, SolidMesh< dimension > > + : public internal::ColocationImpl< dimension, SolidMesh< dimension > > { public: Impl( const SolidMesh< dimension >& mesh ) - : detail::ColocationImpl< dimension, SolidMesh< dimension > >( - mesh ) + : internal::ColocationImpl< dimension, SolidMesh< dimension > >( + mesh ) { } }; diff --git a/src/geode/inspector/criterion/colocation/surface_colocation.cpp b/src/geode/inspector/criterion/colocation/surface_colocation.cpp index 50cbb31f..019d0cef 100644 --- a/src/geode/inspector/criterion/colocation/surface_colocation.cpp +++ b/src/geode/inspector/criterion/colocation/surface_colocation.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -33,12 +33,12 @@ namespace geode { template < index_t dimension > class SurfaceMeshColocation< dimension >::Impl - : public detail::ColocationImpl< dimension, SurfaceMesh< dimension > > + : public internal::ColocationImpl< dimension, SurfaceMesh< dimension > > { public: Impl( const SurfaceMesh< dimension >& mesh ) - : detail::ColocationImpl< dimension, SurfaceMesh< dimension > >( - mesh ) + : internal::ColocationImpl< dimension, SurfaceMesh< dimension > >( + mesh ) { } }; diff --git a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp index 9d07e3ec..1d8db472 100644 --- a/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/brep_meshes_degeneration.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include namespace geode { diff --git a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp index a79c9d9a..85f3266d 100644 --- a/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/edgedcurve_degeneration.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include diff --git a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp index 04691d6a..a895d9bf 100644 --- a/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/section_meshes_degeneration.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include namespace geode { diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp index b57f74f8..4b7535b3 100644 --- a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -37,17 +37,17 @@ namespace geode { template < index_t dimension > class SolidMeshDegeneration< dimension >::Impl - : public detail::DegenerationImpl< SolidMesh< dimension > > + : public internal::DegenerationImpl< SolidMesh< dimension > > { public: Impl( const SolidMesh< dimension >& mesh ) - : detail::DegenerationImpl< SolidMesh< dimension > >{ mesh } + : internal::DegenerationImpl< SolidMesh< dimension > >{ mesh } { } bool is_mesh_degenerated() const final { - if( this->detail::DegenerationImpl< + if( this->internal::DegenerationImpl< SolidMesh< dimension > >::is_mesh_degenerated() ) { return true; diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp index 61695745..f87c9d57 100644 --- a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp +++ b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include @@ -37,17 +37,17 @@ namespace geode { template < index_t dimension > class SurfaceMeshDegeneration< dimension >::Impl - : public detail::DegenerationImpl< SurfaceMesh< dimension > > + : public internal::DegenerationImpl< SurfaceMesh< dimension > > { public: Impl( const SurfaceMesh< dimension >& mesh ) - : detail::DegenerationImpl< SurfaceMesh< dimension > >{ mesh } + : internal::DegenerationImpl< SurfaceMesh< dimension > >{ mesh } { } bool is_mesh_degenerated() const final { - if( this->detail::DegenerationImpl< + if( this->internal::DegenerationImpl< SurfaceMesh< dimension > >::is_mesh_degenerated() ) { return true; diff --git a/src/geode/inspector/criterion/private/colocation_impl.cpp b/src/geode/inspector/criterion/internal/colocation_impl.cpp similarity index 98% rename from src/geode/inspector/criterion/private/colocation_impl.cpp rename to src/geode/inspector/criterion/internal/colocation_impl.cpp index 3c034e4f..1a1370e8 100644 --- a/src/geode/inspector/criterion/private/colocation_impl.cpp +++ b/src/geode/inspector/criterion/internal/colocation_impl.cpp @@ -21,7 +21,7 @@ * */ -#include +#include #include @@ -97,7 +97,7 @@ namespace namespace geode { - namespace detail + namespace internal { template < index_t dimension, typename Mesh > ColocationImpl< dimension, Mesh >::ColocationImpl( const Mesh& mesh ) @@ -139,5 +139,5 @@ namespace geode ColocationImpl< 3, SurfaceMesh3D >; template class opengeode_inspector_inspector_api ColocationImpl< 3, SolidMesh3D >; - } // namespace detail + } // namespace internal } // namespace geode diff --git a/src/geode/inspector/criterion/private/component_meshes_adjacency.cpp b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp similarity index 97% rename from src/geode/inspector/criterion/private/component_meshes_adjacency.cpp rename to src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp index 575e279c..55770276 100644 --- a/src/geode/inspector/criterion/private/component_meshes_adjacency.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_adjacency.cpp @@ -21,7 +21,7 @@ * */ -#include +#include #include diff --git a/src/geode/inspector/criterion/private/component_meshes_degeneration.cpp b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp similarity index 98% rename from src/geode/inspector/criterion/private/component_meshes_degeneration.cpp rename to src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp index 1dff231d..e571bd32 100644 --- a/src/geode/inspector/criterion/private/component_meshes_degeneration.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_degeneration.cpp @@ -21,7 +21,7 @@ * */ -#include +#include #include diff --git a/src/geode/inspector/criterion/private/component_meshes_manifold.cpp b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp similarity index 97% rename from src/geode/inspector/criterion/private/component_meshes_manifold.cpp rename to src/geode/inspector/criterion/internal/component_meshes_manifold.cpp index 31c5ccdd..0aee5de2 100644 --- a/src/geode/inspector/criterion/private/component_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/internal/component_meshes_manifold.cpp @@ -21,7 +21,7 @@ * */ -#include +#include #include diff --git a/src/geode/inspector/criterion/private/degeneration_impl.cpp b/src/geode/inspector/criterion/internal/degeneration_impl.cpp similarity index 97% rename from src/geode/inspector/criterion/private/degeneration_impl.cpp rename to src/geode/inspector/criterion/internal/degeneration_impl.cpp index 3ba5b6d5..9970e46d 100644 --- a/src/geode/inspector/criterion/private/degeneration_impl.cpp +++ b/src/geode/inspector/criterion/internal/degeneration_impl.cpp @@ -21,7 +21,7 @@ * */ -#include +#include #include @@ -35,7 +35,7 @@ namespace geode { - namespace detail + namespace internal { template < class MeshType > DegenerationImpl< MeshType >::DegenerationImpl( const MeshType& mesh ) @@ -109,5 +109,5 @@ namespace geode DegenerationImpl< SurfaceMesh3D >; template class opengeode_inspector_inspector_api DegenerationImpl< SolidMesh3D >; - } // namespace detail + } // namespace internal } // namespace geode diff --git a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp index d845f774..3c312687 100644 --- a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp @@ -35,10 +35,10 @@ #include #include +#include #include #include #include -#include namespace geode { diff --git a/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp index 96ce5b18..45299481 100644 --- a/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/section_meshes_manifold.cpp @@ -28,7 +28,7 @@ #include -#include +#include namespace geode { diff --git a/src/geode/inspector/topology/brep_blocks_topology.cpp b/src/geode/inspector/topology/brep_blocks_topology.cpp index df30fa8b..91375a3a 100644 --- a/src/geode/inspector/topology/brep_blocks_topology.cpp +++ b/src/geode/inspector/topology/brep_blocks_topology.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include namespace { @@ -119,7 +119,7 @@ namespace geode unique_vertex_is_part_of_two_blocks_and_no_boundary_surface( index_t unique_vertex_index ) const { - const auto block_uuids = detail::components_uuids( + const auto block_uuids = internal::components_uuids( brep_, unique_vertex_index, Block3D::component_type_static() ); if( block_uuids.size() != 2 ) { @@ -170,7 +170,7 @@ namespace geode BRepBlocksTopology::unique_vertex_block_cmvs_count_is_incorrect( index_t unique_vertex_index ) const { - const auto block_uuids = detail::components_uuids( + const auto block_uuids = internal::components_uuids( brep_, unique_vertex_index, Block3D::component_type_static() ); std::vector< ComponentMeshVertex > block_cmvs; @@ -342,7 +342,7 @@ namespace geode " is not meshed." ) ); continue; } - auto block_result = detail:: + auto block_result = internal:: brep_component_vertices_not_associated_to_unique_vertices( brep_, block.component_id(), block.mesh() ); if( block_result.nb_issues() != 0 ) diff --git a/src/geode/inspector/topology/brep_corners_topology.cpp b/src/geode/inspector/topology/brep_corners_topology.cpp index 1e2b27a4..8a22d952 100644 --- a/src/geode/inspector/topology/brep_corners_topology.cpp +++ b/src/geode/inspector/topology/brep_corners_topology.cpp @@ -22,7 +22,7 @@ */ #include -#include +#include #include @@ -264,7 +264,7 @@ namespace geode " is not meshed." ) ); continue; } - auto corner_result = detail:: + auto corner_result = internal:: brep_component_vertices_not_associated_to_unique_vertices( brep_, corner.component_id(), corner.mesh() ); if( corner_result.nb_issues() != 0 ) diff --git a/src/geode/inspector/topology/brep_lines_topology.cpp b/src/geode/inspector/topology/brep_lines_topology.cpp index bf1e1a69..093ddfc8 100644 --- a/src/geode/inspector/topology/brep_lines_topology.cpp +++ b/src/geode/inspector/topology/brep_lines_topology.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include namespace geode { @@ -172,7 +172,7 @@ namespace geode embedding.id().string() + "'." ); } if( embedding.type() == Block3D::component_type_static() - && !detail::brep_blocks_are_meshed( brep_ ) ) + && !internal::brep_blocks_are_meshed( brep_ ) ) { continue; } @@ -199,16 +199,16 @@ namespace geode BRepLinesTopology::vertex_is_part_of_invalid_single_line( index_t unique_vertex_index ) const { - const auto line_uuids = detail::components_uuids( + const auto line_uuids = internal::components_uuids( brep_, unique_vertex_index, Line3D::component_type_static() ); if( line_uuids.size() != 1 ) { return std::nullopt; } const auto& line_id = line_uuids[0]; - const auto surface_uuids = detail::components_uuids( + const auto surface_uuids = internal::components_uuids( brep_, unique_vertex_index, Surface3D::component_type_static() ); - const auto block_uuids = detail::components_uuids( + const auto block_uuids = internal::components_uuids( brep_, unique_vertex_index, Block3D::component_type_static() ); if( surface_uuids.size() == 1 ) { @@ -229,7 +229,7 @@ namespace geode } else if( surface_uuids.empty() ) { - if( !detail::brep_blocks_are_meshed( brep_ ) ) + if( !internal::brep_blocks_are_meshed( brep_ ) ) { return std::nullopt; } @@ -313,7 +313,7 @@ namespace geode " is a line without mesh." ) ); } - auto line_result = detail:: + auto line_result = internal:: brep_component_vertices_not_associated_to_unique_vertices( brep_, line.component_id(), line.mesh() ); if( line_result.nb_issues() != 0 ) diff --git a/src/geode/inspector/topology/brep_surfaces_topology.cpp b/src/geode/inspector/topology/brep_surfaces_topology.cpp index 303fb304..4d90303b 100644 --- a/src/geode/inspector/topology/brep_surfaces_topology.cpp +++ b/src/geode/inspector/topology/brep_surfaces_topology.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include namespace { @@ -195,7 +195,7 @@ namespace geode BRepSurfacesTopology::vertex_is_part_of_invalid_embedded_surface( const index_t unique_vertex_index ) const { - for( const auto surface_id : detail::components_uuids( brep_, + for( const auto surface_id : internal::components_uuids( brep_, unique_vertex_index, Surface3D::component_type_static() ) ) { for( const auto& embedding : brep_.embeddings( surface_id ) ) @@ -209,7 +209,7 @@ namespace geode "', which is both internal and boundary of ", "block with uuid '", embedding.id().string(), "'." ); } - if( detail::brep_blocks_are_meshed( brep_ ) + if( internal::brep_blocks_are_meshed( brep_ ) && !absl::c_any_of( brep_.component_mesh_vertices( unique_vertex_index ), [&embedding]( const ComponentMeshVertex& cmv ) { @@ -233,14 +233,14 @@ namespace geode BRepSurfacesTopology::vertex_is_part_of_invalid_single_surface( index_t unique_vertex_index ) const { - const auto surface_uuids = detail::components_uuids( + const auto surface_uuids = internal::components_uuids( brep_, unique_vertex_index, Surface3D::component_type_static() ); if( surface_uuids.size() != 1 ) { return std::nullopt; } const auto& surface_id = surface_uuids[0]; - const auto block_uuids = detail::components_uuids( + const auto block_uuids = internal::components_uuids( brep_, unique_vertex_index, Block3D::component_type_static() ); if( block_uuids.size() > 2 ) { @@ -251,7 +251,7 @@ namespace geode } if( brep_.nb_embeddings( surface_id ) > 0 ) { - if( detail::brep_blocks_are_meshed( brep_ ) ) + if( internal::brep_blocks_are_meshed( brep_ ) ) { if( block_uuids.size() != 1 ) { @@ -294,13 +294,13 @@ namespace geode BRepSurfacesTopology::vertex_is_part_of_invalid_multiple_surfaces( index_t unique_vertex_index ) const { - const auto surface_uuids = detail::components_uuids( + const auto surface_uuids = internal::components_uuids( brep_, unique_vertex_index, Surface3D::component_type_static() ); if( surface_uuids.size() < 2 ) { return std::nullopt; } - const auto line_uuids = detail::components_uuids( + const auto line_uuids = internal::components_uuids( brep_, unique_vertex_index, Line3D::component_type_static() ); if( line_uuids.empty() ) { @@ -377,7 +377,7 @@ namespace geode BRepSurfacesTopology::vertex_is_part_of_line_and_not_on_surface_border( index_t unique_vertex_index ) const { - const auto line_uuids = detail::components_uuids( + const auto line_uuids = internal::components_uuids( brep_, unique_vertex_index, Line3D::component_type_static() ); if( line_uuids.empty() ) { @@ -425,7 +425,7 @@ namespace geode " is a surface without mesh." ) ); } - auto surface_result = detail:: + auto surface_result = internal:: brep_component_vertices_not_associated_to_unique_vertices( brep_, surface.component_id(), surface.mesh() ); if( surface_result.nb_issues() != 0 ) diff --git a/src/geode/inspector/topology/private/topology_helpers.cpp b/src/geode/inspector/topology/internal/topology_helpers.cpp similarity index 96% rename from src/geode/inspector/topology/private/topology_helpers.cpp rename to src/geode/inspector/topology/internal/topology_helpers.cpp index f9b2042e..65e9444c 100644 --- a/src/geode/inspector/topology/private/topology_helpers.cpp +++ b/src/geode/inspector/topology/internal/topology_helpers.cpp @@ -21,7 +21,7 @@ * */ -#include +#include #include #include @@ -34,7 +34,7 @@ namespace geode { - namespace detail + namespace internal { bool brep_blocks_are_meshed( const BRep& brep ) { @@ -101,5 +101,5 @@ namespace geode } return result; } - } // namespace detail + } // namespace internal } // namespace geode \ No newline at end of file diff --git a/src/geode/inspector/topology/section_corners_topology.cpp b/src/geode/inspector/topology/section_corners_topology.cpp index 2a146801..7377d0e7 100644 --- a/src/geode/inspector/topology/section_corners_topology.cpp +++ b/src/geode/inspector/topology/section_corners_topology.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include @@ -248,7 +248,7 @@ namespace geode "Corner " + corner.id().string() + " is not meshed." ); continue; } - auto corner_result = detail:: + auto corner_result = internal:: section_component_vertices_are_associated_to_unique_vertices( section_, corner.component_id(), corner.mesh() ); if( corner_result.nb_issues() != 0 ) diff --git a/src/geode/inspector/topology/section_lines_topology.cpp b/src/geode/inspector/topology/section_lines_topology.cpp index 69a4da8e..038e3394 100644 --- a/src/geode/inspector/topology/section_lines_topology.cpp +++ b/src/geode/inspector/topology/section_lines_topology.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include namespace geode { @@ -185,7 +185,7 @@ namespace geode for( const auto& embedding : section_.embeddings( line_cmv.component_id.id() ) ) { - if( detail::section_surfaces_are_meshed( section_ ) + if( internal::section_surfaces_are_meshed( section_ ) && !absl::c_any_of( section_.component_mesh_vertices( unique_vertex_index ), [&embedding]( const ComponentMeshVertex& cmv ) { @@ -209,14 +209,14 @@ namespace geode SectionLinesTopology::vertex_is_part_of_invalid_single_line( index_t unique_vertex_index ) const { - const auto line_uuids = detail::components_uuids( + const auto line_uuids = internal::components_uuids( section_, unique_vertex_index, Line2D::component_type_static() ); if( line_uuids.size() != 1 ) { return std::nullopt; } const auto& line_id = line_uuids[0]; - const auto surface_uuids = detail::components_uuids( + const auto surface_uuids = internal::components_uuids( section_, unique_vertex_index, Surface2D::component_type_static() ); if( surface_uuids.size() > 2 ) { @@ -226,7 +226,7 @@ namespace geode } if( section_.nb_embeddings( line_id ) > 0 ) { - if( detail::section_surfaces_are_meshed( section_ ) + if( internal::section_surfaces_are_meshed( section_ ) && ( surface_uuids.size() != 1 || !section_.Relationships::is_internal( line_id, surface_uuids[0] ) ) ) @@ -300,7 +300,7 @@ namespace geode line.id(), absl::StrCat( line.id().string(), " is a line without mesh." ) ); } - auto line_result = detail:: + auto line_result = internal:: section_component_vertices_are_associated_to_unique_vertices( section_, line.component_id(), line.mesh() ); if( line_result.nb_issues() != 0 ) diff --git a/src/geode/inspector/topology/section_surfaces_topology.cpp b/src/geode/inspector/topology/section_surfaces_topology.cpp index d8970c61..9b0b1820 100644 --- a/src/geode/inspector/topology/section_surfaces_topology.cpp +++ b/src/geode/inspector/topology/section_surfaces_topology.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include namespace geode { @@ -112,7 +112,7 @@ namespace geode SectionSurfacesTopology::vertex_is_part_of_invalid_embedded_surface( index_t unique_vertex_index ) const { - const auto surface_uuids = detail::components_uuids( + const auto surface_uuids = internal::components_uuids( section_, unique_vertex_index, Surface2D::component_type_static() ); if( surface_uuids.size() == 2 ) { @@ -144,7 +144,7 @@ namespace geode vertex_is_part_of_line_and_not_on_surface_border( index_t unique_vertex_index ) const { - if( !detail::section_surfaces_are_meshed( section_ ) ) + if( !internal::section_surfaces_are_meshed( section_ ) ) { return std::nullopt; } @@ -193,7 +193,7 @@ namespace geode " is a surface without mesh." ) ); } - auto surface_result = detail:: + auto surface_result = internal:: section_component_vertices_are_associated_to_unique_vertices( section_, surface.component_id(), surface.mesh() ); if( surface_result.nb_issues() != 0 )