Merge pull request #926 from Geode-solutions/fix/split_along_mesh_elements

panquez · web-flow · commit aeda0c713e8c · 2024-05-24T15:01:07.000+02:00
fix(CutAlongInternalSurfaces): Renamed class to SplitAlongBlockMeshBo…
diff --git a/include/geode/mesh/helpers/detail/split_along_solid_facets.h b/include/geode/mesh/helpers/detail/split_along_solid_facets.h
@@ -42,18 +42,18 @@ namespace geode
 {
     namespace detail
     {
-        class opengeode_mesh_api CutAlongSolidFacets
+        class opengeode_mesh_api SplitAlongSolidFacets
         {
         public:
-            CutAlongSolidFacets(
+            SplitAlongSolidFacets(
                 const SolidMesh3D& mesh, SolidMeshBuilder3D& builder );
-            ~CutAlongSolidFacets();
+            ~SplitAlongSolidFacets();
 
             /*
-             * Cuts the solid along given facets, and returns the mapping on
+             * Splits the solid along given facets, and returns the mapping on
              * vertices and facets.
              */
-            MeshesElementsMapping cut_solid_along_facets(
+            MeshesElementsMapping split_solid_along_facets(
                 absl::Span< const PolyhedronFacet > facets_list );
 
         private:
diff --git a/include/geode/model/helpers/detail/split_along_block_mesh_borders.h b/include/geode/model/helpers/detail/split_along_block_mesh_borders.h
@@ -40,27 +40,30 @@ namespace geode
 {
     namespace detail
     {
-        class opengeode_model_api CutAlongInternalSurfaces
+        class opengeode_model_api SplitAlongBlockMeshBorders
         {
         public:
-            CutAlongInternalSurfaces( const BRep& model, BRepBuilder& builder );
-            ~CutAlongInternalSurfaces();
+            SplitAlongBlockMeshBorders(
+                const BRep& model, BRepBuilder& builder );
+            ~SplitAlongBlockMeshBorders();
 
-            /* Cuts the blocks along internal surfaces, and returns pairs of
+            /* Splits the blocks along internal surfaces, facets without
+             * adjacencies and non manifold vertices, and returns pairs of
              * component mesh vertices where the blocks vertices were split
              * (first the initial cmv of the vertices, second the cmv of the
              * newly created vertex)
              */
             std::vector< std::pair< ComponentMeshVertex, ComponentMeshVertex > >
-                cut_all_blocks();
+                split_all_blocks();
 
-            /* Cuts the block along internal surfaces, and returns pairs of
+            /* Splits the block along internal surfaces, facets without
+             * adjacencies and non manifold vertices, and returns pairs of
              * component mesh vertices where the block vertices were split
              * (first the initial id of the vertices, second the id of the newly
              * created vertex)
              */
             std::vector< std::pair< ComponentMeshVertex, ComponentMeshVertex > >
-                cut_block( const Block3D& block );
+                split_block( const Block3D& block );
 
         private:
             IMPLEMENTATION_MEMBER( impl_ );
diff --git a/include/geode/model/helpers/detail/split_along_surface_mesh_borders.h b/include/geode/model/helpers/detail/split_along_surface_mesh_borders.h
@@ -38,29 +38,29 @@ namespace geode
     namespace detail
     {
         template < typename Model >
-        class CutAlongInternalLines
+        class SplitAlongSurfaceMeshBorders
         {
         public:
-            CutAlongInternalLines( Model& model );
-            CutAlongInternalLines(
+            SplitAlongSurfaceMeshBorders( Model& model );
+            SplitAlongSurfaceMeshBorders(
                 const Model& model, typename Model::Builder& builder );
-            ~CutAlongInternalLines();
+            ~SplitAlongSurfaceMeshBorders();
 
-            /* Cuts the surfaces along internal lines, and returns pairs of
+            /* Splits the surfaces along internal lines, and returns pairs of
              * component mesh vertices where the surfaces vertices were split
              * (first the initial cmv of the vertices, second the cmv of the
              * newly created vertex)
              */
             std::vector< std::pair< ComponentMeshVertex, ComponentMeshVertex > >
-                cut_all_surfaces();
+                split_all_surfaces();
 
-            /* Cuts the surface along internal lines, and returns pairs of
+            /* Splits the surface along internal lines, and returns pairs of
              * component mesh vertices where the surface vertices were split
              * (first the initial id of the vertices, second the id of the newly
              * created vertex)
              */
             std::vector< std::pair< ComponentMeshVertex, ComponentMeshVertex > >
-                cut_surface( const Surface< Model::dim >& surface );
+                split_surface( const Surface< Model::dim >& surface );
 
         private:
             IMPLEMENTATION_MEMBER( impl_ );
diff --git a/src/geode/mesh/CMakeLists.txt b/src/geode/mesh/CMakeLists.txt
@@ -117,7 +117,7 @@ add_geode_library(
         "helpers/detail/component_identifier.cpp"
         "helpers/detail/create_mesh.cpp"
         "helpers/detail/curve_merger.cpp"
-        "helpers/detail/cut_along_solid_facets.cpp"
+        "helpers/detail/split_along_solid_facets.cpp"
         "helpers/detail/debug.cpp"
         "helpers/detail/element_identifier.cpp"
         "helpers/detail/solid_merger.cpp"
@@ -299,7 +299,7 @@ add_geode_library(
         "core/detail/geode_elements.h"
         "core/detail/vertex_cycle.h"
         "helpers/detail/curve_merger.h"
-        "helpers/detail/cut_along_solid_facets.h"
+        "helpers/detail/split_along_solid_facets.h"
         "helpers/detail/component_identifier.h"
         "helpers/detail/create_mesh.h"
         "helpers/detail/debug.h"
diff --git a/src/geode/mesh/helpers/detail/split_along_solid_facets.cpp b/src/geode/mesh/helpers/detail/split_along_solid_facets.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <geode/mesh/helpers/detail/cut_along_solid_facets.h>
+#include <geode/mesh/helpers/detail/split_along_solid_facets.h>
 
 #include <geode/basic/attribute_manager.h>
 #include <geode/basic/pimpl_impl.h>
@@ -39,7 +39,7 @@ namespace geode
 {
     namespace detail
     {
-        class CutAlongSolidFacets::Impl
+        class SplitAlongSolidFacets::Impl
         {
             struct SolidInfo
             {
@@ -58,7 +58,7 @@ namespace geode
             {
             }
 
-            MeshesElementsMapping cut_solid_along_facets(
+            MeshesElementsMapping split_solid_along_facets(
                 absl::Span< const PolyhedronFacet > facets_list )
             {
                 bool facets_enabled = solid_.are_facets_enabled();
@@ -96,11 +96,11 @@ namespace geode
                     {
                         builder_.unset_polyhedron_adjacent( solid_facet );
                         builder_.unset_polyhedron_adjacent( adj.value() );
-                        for( const auto vertex_id :
-                            solid_.polyhedron_facet_vertices( solid_facet ) )
-                        {
-                            info.vertices_to_check[vertex_id] = true;
-                        }
+                    }
+                    for( const auto vertex_id :
+                        solid_.polyhedron_facet_vertices( solid_facet ) )
+                    {
+                        info.vertices_to_check[vertex_id] = true;
                     }
                 }
                 for( const auto polyhedron_id : Range{ solid_.nb_polyhedra() } )
@@ -142,7 +142,7 @@ namespace geode
                     auto nb_polyhedra_around = polyhedra_around.size();
                     OPENGEODE_ASSERT(
                         nb_polyhedra_around <= all_polyhedra_around.size(),
-                        "[CutAlongSolidFacets] Wrong size comparison" );
+                        "[SplitAlongSolidFacets] Wrong size comparison" );
                     /// Already processed polyhedra
                     PolyhedraAroundVertex processed_polyhedra;
                     while( nb_polyhedra_around != all_polyhedra_around.size() )
@@ -187,7 +187,7 @@ namespace geode
                 }
                 OPENGEODE_ASSERT(
                     !solid_.polyhedra_around_vertex( vertex_id ).empty(),
-                    "[BRepFromMeshBuilder::cut_block_by_surfaces] Lost "
+                    "[BRepFromMeshBuilder::split_block_by_surfaces] Lost "
                     "polyhedron around vertex" );
                 return new_vertex_id;
             }
@@ -234,16 +234,17 @@ namespace geode
             }
 
             ElementsMapping final_facets_mapping(
-                const ElementsMapping& solid2cut_mapping,
+                const ElementsMapping& solid2split_mapping,
                 absl::Span< const index_t > clean_mapping ) const
             {
                 ElementsMapping facets_mapping;
-                for( const auto& solid2cut : solid2cut_mapping.in2out_map() )
+                for( const auto& solid2split :
+                    solid2split_mapping.in2out_map() )
                 {
-                    for( const auto facet_after_cut : solid2cut.second )
+                    for( const auto facet_after_split : solid2split.second )
                     {
-                        facets_mapping.map(
-                            solid2cut.first, clean_mapping[facet_after_cut] );
+                        facets_mapping.map( solid2split.first,
+                            clean_mapping[facet_after_split] );
                     }
                 }
                 return facets_mapping;
@@ -288,16 +289,17 @@ namespace geode
             }
 
             ElementsMapping final_edges_mapping(
-                const ElementsMapping& solid2cut_mapping,
+                const ElementsMapping& solid2split_mapping,
                 absl::Span< const index_t > clean_mapping ) const
             {
                 ElementsMapping edges_mapping;
-                for( const auto& solid2cut : solid2cut_mapping.in2out_map() )
+                for( const auto& solid2split :
+                    solid2split_mapping.in2out_map() )
                 {
-                    for( const auto edge_after_cut : solid2cut.second )
+                    for( const auto edge_after_split : solid2split.second )
                     {
-                        edges_mapping.map(
-                            solid2cut.first, clean_mapping[edge_after_cut] );
+                        edges_mapping.map( solid2split.first,
+                            clean_mapping[edge_after_split] );
                     }
                 }
                 return edges_mapping;
@@ -308,18 +310,18 @@ namespace geode
             SolidMeshBuilder3D& builder_;
         };
 
-        CutAlongSolidFacets::CutAlongSolidFacets(
+        SplitAlongSolidFacets::SplitAlongSolidFacets(
             const SolidMesh3D& mesh, SolidMeshBuilder3D& builder )
             : impl_{ mesh, builder }
         {
         }
 
-        CutAlongSolidFacets::~CutAlongSolidFacets() {}
+        SplitAlongSolidFacets::~SplitAlongSolidFacets() {}
 
-        MeshesElementsMapping CutAlongSolidFacets::cut_solid_along_facets(
+        MeshesElementsMapping SplitAlongSolidFacets::split_solid_along_facets(
             absl::Span< const PolyhedronFacet > facets_list )
         {
-            return impl_->cut_solid_along_facets( facets_list );
+            return impl_->split_solid_along_facets( facets_list );
         }
     } // namespace detail
 } // namespace geode
diff --git a/src/geode/model/CMakeLists.txt b/src/geode/model/CMakeLists.txt
@@ -41,8 +41,8 @@ add_geode_library(
         "helpers/surface_radial_sort.cpp"
         "helpers/ray_tracing.cpp"
         "helpers/detail/build_model_boundaries.cpp"
-        "helpers/detail/cut_along_internal_lines.cpp"
-        "helpers/detail/cut_along_internal_surfaces.cpp"
+        "helpers/detail/split_along_surface_mesh_borders.cpp"
+        "helpers/detail/split_along_block_mesh_borders.cpp"
         "mixin/builder/blocks_builder.cpp"
         "mixin/builder/block_collections_builder.cpp"
         "mixin/builder/corners_builder.cpp"
@@ -163,8 +163,8 @@ add_geode_library(
         "representation/io/geode/geode_section_output.h"
     ADVANCED_HEADERS
         "helpers/detail/build_model_boundaries.h"
-        "helpers/detail/cut_along_internal_lines.h"
-        "helpers/detail/cut_along_internal_surfaces.h"
+        "helpers/detail/split_along_surface_mesh_borders.h"
+        "helpers/detail/split_along_block_mesh_borders.h"
         "mixin/core/detail/components_storage.h"
         "mixin/core/detail/count_relationships.h"
         "mixin/core/detail/mesh_storage.h"
diff --git a/src/geode/model/helpers/detail/split_along_block_mesh_borders.cpp b/src/geode/model/helpers/detail/split_along_block_mesh_borders.cpp
diff --git a/src/geode/model/helpers/detail/split_along_surface_mesh_borders.cpp b/src/geode/model/helpers/detail/split_along_surface_mesh_borders.cpp
diff --git a/tests/mesh/test-convert-solid.cpp b/tests/mesh/test-convert-solid.cpp

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`-#include <geode/mesh/helpers/detail/cut_along_solid_facets.h>`
	`24`	`+#include <geode/mesh/helpers/detail/split_along_solid_facets.h>`
`25`	`25`
`26`	`26`	`#include <geode/basic/attribute_manager.h>`
`27`	`27`	`#include <geode/basic/pimpl_impl.h>`
`@@ -39,7 +39,7 @@ namespace geode`
`39`	`39`	`{`
`40`	`40`	`namespace detail`
`41`	`41`	`{`
`42`		`- class CutAlongSolidFacets::Impl`
	`42`	`+ class SplitAlongSolidFacets::Impl`
`43`	`43`	`{`
`44`	`44`	`struct SolidInfo`
`45`	`45`	`{`
`@@ -58,7 +58,7 @@ namespace geode`
`58`	`58`	`{`
`59`	`59`	`}`
`60`	`60`
`61`		`- MeshesElementsMapping cut_solid_along_facets(`
	`61`	`+ MeshesElementsMapping split_solid_along_facets(`
`62`	`62`	`absl::Span< const PolyhedronFacet > facets_list )`
`63`	`63`	`{`
`64`	`64`	`bool facets_enabled = solid_.are_facets_enabled();`
`@@ -96,11 +96,11 @@ namespace geode`
`96`	`96`	`{`
`97`	`97`	`builder_.unset_polyhedron_adjacent( solid_facet );`
`98`	`98`	`builder_.unset_polyhedron_adjacent( adj.value() );`
`99`		`- for( const auto vertex_id :`
`100`		`- solid_.polyhedron_facet_vertices( solid_facet ) )`
`101`		`- {`
`102`		`- info.vertices_to_check[vertex_id] = true;`
`103`		`- }`
	`99`	`+ }`
	`100`	`+ for( const auto vertex_id :`
	`101`	`+ solid_.polyhedron_facet_vertices( solid_facet ) )`
	`102`	`+ {`
	`103`	`+ info.vertices_to_check[vertex_id] = true;`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`for( const auto polyhedron_id : Range{ solid_.nb_polyhedra() } )`
`@@ -142,7 +142,7 @@ namespace geode`
`142`	`142`	`auto nb_polyhedra_around = polyhedra_around.size();`
`143`	`143`	`OPENGEODE_ASSERT(`
`144`	`144`	`nb_polyhedra_around <= all_polyhedra_around.size(),`
`145`		`- "[CutAlongSolidFacets] Wrong size comparison" );`
	`145`	`+ "[SplitAlongSolidFacets] Wrong size comparison" );`
`146`	`146`	`/// Already processed polyhedra`
`147`	`147`	`PolyhedraAroundVertex processed_polyhedra;`
`148`	`148`	`while( nb_polyhedra_around != all_polyhedra_around.size() )`
`@@ -187,7 +187,7 @@ namespace geode`
`187`	`187`	`}`
`188`	`188`	`OPENGEODE_ASSERT(`
`189`	`189`	`!solid_.polyhedra_around_vertex( vertex_id ).empty(),`
`190`		`- "[BRepFromMeshBuilder::cut_block_by_surfaces] Lost "`
	`190`	`+ "[BRepFromMeshBuilder::split_block_by_surfaces] Lost "`
`191`	`191`	`"polyhedron around vertex" );`
`192`	`192`	`return new_vertex_id;`
`193`	`193`	`}`
`@@ -234,16 +234,17 @@ namespace geode`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`ElementsMapping final_facets_mapping(`
`237`		`- const ElementsMapping& solid2cut_mapping,`
	`237`	`+ const ElementsMapping& solid2split_mapping,`
`238`	`238`	`absl::Span< const index_t > clean_mapping ) const`
`239`	`239`	`{`
`240`	`240`	`ElementsMapping facets_mapping;`
`241`		`- for( const auto& solid2cut : solid2cut_mapping.in2out_map() )`
	`241`	`+ for( const auto& solid2split :`
	`242`	`+ solid2split_mapping.in2out_map() )`
`242`	`243`	`{`
`243`		`- for( const auto facet_after_cut : solid2cut.second )`
	`244`	`+ for( const auto facet_after_split : solid2split.second )`
`244`	`245`	`{`
`245`		`- facets_mapping.map(`
`246`		`- solid2cut.first, clean_mapping[facet_after_cut] );`
	`246`	`+ facets_mapping.map( solid2split.first,`
	`247`	`+ clean_mapping[facet_after_split] );`
`247`	`248`	`}`
`248`	`249`	`}`
`249`	`250`	`return facets_mapping;`
`@@ -288,16 +289,17 @@ namespace geode`
`288`	`289`	`}`
`289`	`290`
`290`	`291`	`ElementsMapping final_edges_mapping(`
`291`		`- const ElementsMapping& solid2cut_mapping,`
	`292`	`+ const ElementsMapping& solid2split_mapping,`
`292`	`293`	`absl::Span< const index_t > clean_mapping ) const`
`293`	`294`	`{`
`294`	`295`	`ElementsMapping edges_mapping;`
`295`		`- for( const auto& solid2cut : solid2cut_mapping.in2out_map() )`
	`296`	`+ for( const auto& solid2split :`
	`297`	`+ solid2split_mapping.in2out_map() )`
`296`	`298`	`{`
`297`		`- for( const auto edge_after_cut : solid2cut.second )`
	`299`	`+ for( const auto edge_after_split : solid2split.second )`
`298`	`300`	`{`
`299`		`- edges_mapping.map(`
`300`		`- solid2cut.first, clean_mapping[edge_after_cut] );`
	`301`	`+ edges_mapping.map( solid2split.first,`
	`302`	`+ clean_mapping[edge_after_split] );`
`301`	`303`	`}`
`302`	`304`	`}`
`303`	`305`	`return edges_mapping;`
`@@ -308,18 +310,18 @@ namespace geode`
`308`	`310`	`SolidMeshBuilder3D& builder_;`
`309`	`311`	`};`
`310`	`312`
`311`		`- CutAlongSolidFacets::CutAlongSolidFacets(`
	`313`	`+ SplitAlongSolidFacets::SplitAlongSolidFacets(`
`312`	`314`	`const SolidMesh3D& mesh, SolidMeshBuilder3D& builder )`
`313`	`315`	`: impl_{ mesh, builder }`
`314`	`316`	`{`
`315`	`317`	`}`
`316`	`318`
`317`		`- CutAlongSolidFacets::~CutAlongSolidFacets() {}`
	`319`	`+ SplitAlongSolidFacets::~SplitAlongSolidFacets() {}`
`318`	`320`
`319`		`- MeshesElementsMapping CutAlongSolidFacets::cut_solid_along_facets(`
	`321`	`+ MeshesElementsMapping SplitAlongSolidFacets::split_solid_along_facets(`
`320`	`322`	`absl::Span< const PolyhedronFacet > facets_list )`
`321`	`323`	`{`
`322`		`- return impl_->cut_solid_along_facets( facets_list );`
	`324`	`+ return impl_->split_solid_along_facets( facets_list );`
`323`	`325`	`}`
`324`	`326`	`} // namespace detail`
`325`	`327`	`} // namespace geode`