update

BotellaA · BotellaA · commit 7e8fcf8a8dda · 2022-07-20T16:20:06.000+02:00
diff --git a/src/bin/geode-inspector-solid.cpp b/src/bin/geode-inspector-solid.cpp
@@ -34,9 +34,11 @@
 #include <geode/mesh/core/hybrid_solid.h>
 #include <geode/mesh/core/mesh_factory.h>
 #include <geode/mesh/core/polyhedral_solid.h>
+#include <geode/mesh/core/regular_grid_solid.h>
 #include <geode/mesh/core/tetrahedral_solid.h>
 #include <geode/mesh/io/hybrid_solid_input.h>
 #include <geode/mesh/io/polyhedral_solid_input.h>
+#include <geode/mesh/io/regular_grid_input.h>
 #include <geode/mesh/io/tetrahedral_solid_input.h>
 
 #include <geode/io/mesh/detail/common.h>
@@ -127,6 +129,10 @@ int main( int argc, char* argv[] )
         {
             inspect_solid( *geode::load_hybrid_solid< 3 >( filename ) );
         }
+        else if( geode::RegularGridInputFactory3D::has_creator( ext ) )
+        {
+            inspect_solid( *geode::load_regular_grid< 3 >( filename ) );
+        }
         else
         {
             throw geode::OpenGeodeException( "Unable to load file ", filename );
diff --git a/src/bin/geode-inspector-surface.cpp b/src/bin/geode-inspector-surface.cpp
@@ -33,8 +33,10 @@
 
 #include <geode/mesh/core/mesh_factory.h>
 #include <geode/mesh/core/polygonal_surface.h>
+#include <geode/mesh/core/regular_grid_surface.h>
 #include <geode/mesh/core/triangulated_surface.h>
 #include <geode/mesh/io/polygonal_surface_input.h>
+#include <geode/mesh/io/regular_grid_input.h>
 #include <geode/mesh/io/triangulated_surface_input.h>
 
 #include <geode/io/mesh/detail/common.h>
@@ -134,6 +136,10 @@ int main( int argc, char* argv[] )
             inspect_surface(
                 *geode::load_triangulated_surface< 2 >( filename ) );
         }
+        else if( geode::RegularGridInputFactory2D::has_creator( ext ) )
+        {
+            inspect_surface( *geode::load_regular_grid< 2 >( filename ) );
+        }
         else
         {
             throw geode::OpenGeodeException( "Unable to load file ", filename );
diff --git a/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp b/src/geode/inspector/criterion/colocation/unique_vertices_colocation.cpp
@@ -47,7 +47,7 @@ namespace
 {
     template < geode::index_t dimension, typename Model >
     bool model_cmv_is_colocated_on_point_base( const Model& model,
-        const geode::MeshComponentVertex& cmv,
+        const geode::ComponentMeshVertex& cmv,
         const geode::Point< dimension >& point )
     {
         if( cmv.component_id.type()
@@ -71,14 +71,14 @@ namespace
     }
 
     bool model_cmv_is_colocated_on_point( const geode::Section& model,
-        const geode::MeshComponentVertex& cmv,
+        const geode::ComponentMeshVertex& cmv,
         const geode::Point2D& point )
     {
         return model_cmv_is_colocated_on_point_base( model, cmv, point );
     }
 
     bool model_cmv_is_colocated_on_point( const geode::BRep& model,
-        const geode::MeshComponentVertex& cmv,
+        const geode::ComponentMeshVertex& cmv,
         const geode::Point3D& point )
     {
         if( cmv.component_id.type() == geode::Block3D::component_type_static() )
@@ -92,7 +92,7 @@ namespace
 
     template < geode::index_t dimension, typename Model >
     bool model_cmvs_are_colocated_on_point( const Model& model,
-        const std::vector< geode::MeshComponentVertex >& cmvs,
+        const std::vector< geode::ComponentMeshVertex >& cmvs,
         const geode::Point< dimension >& point )
     {
         for( const auto& cmv : cmvs )
@@ -107,7 +107,7 @@ namespace
 
     template < geode::index_t dimension, typename Model >
     geode::Point< dimension > model_unique_vertex_point_base(
-        const Model& model, const geode::MeshComponentVertex& cmv )
+        const Model& model, const geode::ComponentMeshVertex& cmv )
     {
         if( cmv.component_id.type()
             == geode::Line< dimension >::component_type_static() )
@@ -126,14 +126,14 @@ namespace
     }
 
     geode::Point2D model_unique_vertex_point(
-        const geode::Section& model, const geode::MeshComponentVertex& cmv )
+        const geode::Section& model, const geode::ComponentMeshVertex& cmv )
     {
         return model_unique_vertex_point_base< 2, geode::Section >(
             model, cmv );
     }
 
     geode::Point3D model_unique_vertex_point(
-        const geode::BRep& model, const geode::MeshComponentVertex& cmv )
+        const geode::BRep& model, const geode::ComponentMeshVertex& cmv )
     {
         if( cmv.component_id.type() == geode::Block3D::component_type_static() )
         {
@@ -162,7 +162,7 @@ namespace geode
                 Range{ model.nb_unique_vertices() } )
             {
                 const auto& cmvs =
-                    model.mesh_component_vertices( unique_vertex_id );
+                    model.component_mesh_vertices( unique_vertex_id );
                 if( cmvs.empty() )
                 {
                     continue;
@@ -178,7 +178,7 @@ namespace geode
                 Range{ model_.nb_unique_vertices() } )
             {
                 if( !model_cmvs_are_colocated_on_point( model_,
-                        model_.mesh_component_vertices( unique_vertex_id ),
+                        model_.component_mesh_vertices( unique_vertex_id ),
                         unique_vertices_->point( unique_vertex_id ) ) )
                 {
                     if( verbose_ )
@@ -209,7 +209,7 @@ namespace geode
                 Range{ model_.nb_unique_vertices() } )
             {
                 if( !model_cmvs_are_colocated_on_point( model_,
-                        model_.mesh_component_vertices( unique_vertex_id ),
+                        model_.component_mesh_vertices( unique_vertex_id ),
                         unique_vertices_->point( unique_vertex_id ) ) )
                 {
                     if( verbose_ )
@@ -241,7 +241,7 @@ namespace geode
                 Range{ model_.nb_unique_vertices() } )
             {
                 if( !model_cmvs_are_colocated_on_point( model_,
-                        model_.mesh_component_vertices( unique_vertex_id ),
+                        model_.component_mesh_vertices( unique_vertex_id ),
                         unique_vertices_->point( unique_vertex_id ) ) )
                 {
                     if( verbose_ )
diff --git a/src/geode/inspector/topology/private/brep_surfaces_topology_impl.cpp b/src/geode/inspector/topology/private/brep_surfaces_topology_impl.cpp
@@ -159,9 +159,9 @@ namespace geode
                     }
                     if( brep_blocks_are_meshed( brep_ )
                         && !absl::c_any_of(
-                            brep_.mesh_component_vertices( unique_vertex_index,
+                            brep_.component_mesh_vertices( unique_vertex_index,
                                 Block3D::component_type_static() ),
-                            [&embedding]( const MeshComponentVertex& cmv ) {
+                            [&embedding]( const ComponentMeshVertex& cmv ) {
                                 return cmv.component_id.id() == embedding.id();
                             } ) )
                     {
@@ -358,13 +358,13 @@ namespace geode
             vertex_is_part_of_line_and_not_on_surface_border(
                 index_t unique_vertex_index ) const
         {
-            const auto lines = brep_.mesh_component_vertices(
+            const auto lines = brep_.component_mesh_vertices(
                 unique_vertex_index, Line3D::component_type_static() );
             if( lines.empty() )
             {
                 return false;
             }
-            for( const auto surface_vertex : brep_.mesh_component_vertices(
+            for( const auto surface_vertex : brep_.component_mesh_vertices(
                      unique_vertex_index, Surface3D::component_type_static() ) )
             {
                 if( !brep_.surface( surface_vertex.component_id.id() )
diff --git a/src/geode/inspector/topology/private/section_lines_topology_impl.cpp b/src/geode/inspector/topology/private/section_lines_topology_impl.cpp
@@ -134,10 +134,10 @@ namespace geode
                 {
                     if( section_surfaces_are_meshed( section_ )
                         && !absl::c_any_of(
-                            section_.mesh_component_vertices(
+                            section_.component_mesh_vertices(
                                 unique_vertex_index,
                                 Surface2D::component_type_static() ),
-                            [&embedding]( const MeshComponentVertex& cmv ) {
+                            [&embedding]( const ComponentMeshVertex& cmv ) {
                                 return cmv.component_id.id() == embedding.id();
                             } ) )
                     {
diff --git a/src/geode/inspector/topology/private/section_surfaces_topology_impl.cpp b/src/geode/inspector/topology/private/section_surfaces_topology_impl.cpp
@@ -56,7 +56,7 @@ namespace geode
                 index_t unique_vertex_index ) const
         {
             if( section_
-                    .mesh_component_vertices( unique_vertex_index,
+                    .component_mesh_vertices( unique_vertex_index,
                         Surface2D::component_type_static() )
                     .empty() )
             {
@@ -114,13 +114,13 @@ namespace geode
                 return false;
             }
             if( section_
-                    .mesh_component_vertices(
+                    .component_mesh_vertices(
                         unique_vertex_index, Line2D::component_type_static() )
                     .empty() )
             {
                 return false;
             }
-            for( const auto surface_vertex : section_.mesh_component_vertices(
+            for( const auto surface_vertex : section_.component_mesh_vertices(
                      unique_vertex_index, Surface2D::component_type_static() ) )
             {
                 if( !section_.surface( surface_vertex.component_id.id() )

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace`
`47`	`47`	`{`
`48`	`48`	`template < geode::index_t dimension, typename Model >`
`49`	`49`	`bool model_cmv_is_colocated_on_point_base( const Model& model,`
`50`		`- const geode::MeshComponentVertex& cmv,`
	`50`	`+ const geode::ComponentMeshVertex& cmv,`
`51`	`51`	`const geode::Point< dimension >& point )`
`52`	`52`	`{`
`53`	`53`	`if( cmv.component_id.type()`
`@@ -71,14 +71,14 @@ namespace`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`bool model_cmv_is_colocated_on_point( const geode::Section& model,`
`74`		`- const geode::MeshComponentVertex& cmv,`
	`74`	`+ const geode::ComponentMeshVertex& cmv,`
`75`	`75`	`const geode::Point2D& point )`
`76`	`76`	`{`
`77`	`77`	`return model_cmv_is_colocated_on_point_base( model, cmv, point );`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`bool model_cmv_is_colocated_on_point( const geode::BRep& model,`
`81`		`- const geode::MeshComponentVertex& cmv,`
	`81`	`+ const geode::ComponentMeshVertex& cmv,`
`82`	`82`	`const geode::Point3D& point )`
`83`	`83`	`{`
`84`	`84`	`if( cmv.component_id.type() == geode::Block3D::component_type_static() )`
`@@ -92,7 +92,7 @@ namespace`
`92`	`92`
`93`	`93`	`template < geode::index_t dimension, typename Model >`
`94`	`94`	`bool model_cmvs_are_colocated_on_point( const Model& model,`
`95`		`- const std::vector< geode::MeshComponentVertex >& cmvs,`
	`95`	`+ const std::vector< geode::ComponentMeshVertex >& cmvs,`
`96`	`96`	`const geode::Point< dimension >& point )`
`97`	`97`	`{`
`98`	`98`	`for( const auto& cmv : cmvs )`
`@@ -107,7 +107,7 @@ namespace`
`107`	`107`
`108`	`108`	`template < geode::index_t dimension, typename Model >`
`109`	`109`	`geode::Point< dimension > model_unique_vertex_point_base(`
`110`		`- const Model& model, const geode::MeshComponentVertex& cmv )`
	`110`	`+ const Model& model, const geode::ComponentMeshVertex& cmv )`
`111`	`111`	`{`
`112`	`112`	`if( cmv.component_id.type()`
`113`	`113`	`== geode::Line< dimension >::component_type_static() )`
`@@ -126,14 +126,14 @@ namespace`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`geode::Point2D model_unique_vertex_point(`
`129`		`- const geode::Section& model, const geode::MeshComponentVertex& cmv )`
	`129`	`+ const geode::Section& model, const geode::ComponentMeshVertex& cmv )`
`130`	`130`	`{`
`131`	`131`	`return model_unique_vertex_point_base< 2, geode::Section >(`
`132`	`132`	`model, cmv );`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`geode::Point3D model_unique_vertex_point(`
`136`		`- const geode::BRep& model, const geode::MeshComponentVertex& cmv )`
	`136`	`+ const geode::BRep& model, const geode::ComponentMeshVertex& cmv )`
`137`	`137`	`{`
`138`	`138`	`if( cmv.component_id.type() == geode::Block3D::component_type_static() )`
`139`	`139`	`{`
`@@ -162,7 +162,7 @@ namespace geode`
`162`	`162`	`Range{ model.nb_unique_vertices() } )`
`163`	`163`	`{`
`164`	`164`	`const auto& cmvs =`
`165`		`- model.mesh_component_vertices( unique_vertex_id );`
	`165`	`+ model.component_mesh_vertices( unique_vertex_id );`
`166`	`166`	`if( cmvs.empty() )`
`167`	`167`	`{`
`168`	`168`	`continue;`
`@@ -178,7 +178,7 @@ namespace geode`
`178`	`178`	`Range{ model_.nb_unique_vertices() } )`
`179`	`179`	`{`
`180`	`180`	`if( !model_cmvs_are_colocated_on_point( model_,`
`181`		`- model_.mesh_component_vertices( unique_vertex_id ),`
	`181`	`+ model_.component_mesh_vertices( unique_vertex_id ),`
`182`	`182`	`unique_vertices_->point( unique_vertex_id ) ) )`
`183`	`183`	`{`
`184`	`184`	`if( verbose_ )`
`@@ -209,7 +209,7 @@ namespace geode`
`209`	`209`	`Range{ model_.nb_unique_vertices() } )`
`210`	`210`	`{`
`211`	`211`	`if( !model_cmvs_are_colocated_on_point( model_,`
`212`		`- model_.mesh_component_vertices( unique_vertex_id ),`
	`212`	`+ model_.component_mesh_vertices( unique_vertex_id ),`
`213`	`213`	`unique_vertices_->point( unique_vertex_id ) ) )`
`214`	`214`	`{`
`215`	`215`	`if( verbose_ )`
`@@ -241,7 +241,7 @@ namespace geode`
`241`	`241`	`Range{ model_.nb_unique_vertices() } )`
`242`	`242`	`{`
`243`	`243`	`if( !model_cmvs_are_colocated_on_point( model_,`
`244`		`- model_.mesh_component_vertices( unique_vertex_id ),`
	`244`	`+ model_.component_mesh_vertices( unique_vertex_id ),`
`245`	`245`	`unique_vertices_->point( unique_vertex_id ) ) )`
`246`	`246`	`{`
`247`	`247`	`if( verbose_ )`
Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,9 @@ namespace geode`
`159`	`159`	`}`
`160`	`160`	`if( brep_blocks_are_meshed( brep_ )`
`161`	`161`	`&& !absl::c_any_of(`
`162`		`- brep_.mesh_component_vertices( unique_vertex_index,`
	`162`	`+ brep_.component_mesh_vertices( unique_vertex_index,`
`163`	`163`	`Block3D::component_type_static() ),`
`164`		`- [&embedding]( const MeshComponentVertex& cmv ) {`
	`164`	`+ [&embedding]( const ComponentMeshVertex& cmv ) {`
`165`	`165`	`return cmv.component_id.id() == embedding.id();`
`166`	`166`	`} ) )`
`167`	`167`	`{`
`@@ -358,13 +358,13 @@ namespace geode`
`358`	`358`	`vertex_is_part_of_line_and_not_on_surface_border(`
`359`	`359`	`index_t unique_vertex_index ) const`
`360`	`360`	`{`
`361`		`- const auto lines = brep_.mesh_component_vertices(`
	`361`	`+ const auto lines = brep_.component_mesh_vertices(`
`362`	`362`	`unique_vertex_index, Line3D::component_type_static() );`
`363`	`363`	`if( lines.empty() )`
`364`	`364`	`{`
`365`	`365`	`return false;`
`366`	`366`	`}`
`367`		`- for( const auto surface_vertex : brep_.mesh_component_vertices(`
	`367`	`+ for( const auto surface_vertex : brep_.component_mesh_vertices(`
`368`	`368`	`unique_vertex_index, Surface3D::component_type_static() ) )`
`369`	`369`	`{`
`370`	`370`	`if( !brep_.surface( surface_vertex.component_id.id() )`
Original file line number	Diff line number	Diff line change
`@@ -134,10 +134,10 @@ namespace geode`
`134`	`134`	`{`
`135`	`135`	`if( section_surfaces_are_meshed( section_ )`
`136`	`136`	`&& !absl::c_any_of(`
`137`		`- section_.mesh_component_vertices(`
	`137`	`+ section_.component_mesh_vertices(`
`138`	`138`	`unique_vertex_index,`
`139`	`139`	`Surface2D::component_type_static() ),`
`140`		`- [&embedding]( const MeshComponentVertex& cmv ) {`
	`140`	`+ [&embedding]( const ComponentMeshVertex& cmv ) {`
`141`	`141`	`return cmv.component_id.id() == embedding.id();`
`142`	`142`	`} ) )`
`143`	`143`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ namespace geode`
`56`	`56`	`index_t unique_vertex_index ) const`
`57`	`57`	`{`
`58`	`58`	`if( section_`
`59`		`- .mesh_component_vertices( unique_vertex_index,`
	`59`	`+ .component_mesh_vertices( unique_vertex_index,`
`60`	`60`	`Surface2D::component_type_static() )`
`61`	`61`	`.empty() )`
`62`	`62`	`{`
`@@ -114,13 +114,13 @@ namespace geode`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`	`if( section_`
`117`		`- .mesh_component_vertices(`
	`117`	`+ .component_mesh_vertices(`
`118`	`118`	`unique_vertex_index, Line2D::component_type_static() )`
`119`	`119`	`.empty() )`
`120`	`120`	`{`
`121`	`121`	`return false;`
`122`	`122`	`}`
`123`		`- for( const auto surface_vertex : section_.mesh_component_vertices(`
	`123`	`+ for( const auto surface_vertex : section_.component_mesh_vertices(`
`124`	`124`	`unique_vertex_index, Surface2D::component_type_static() ) )`
`125`	`125`	`{`
`126`	`126`	`if( !section_.surface( surface_vertex.component_id.id() )`