Merge pull request #1168 from Geode-solutions/feat/poly-tiff

MelchiorSchuh · web-flow · commit e3334029b91b · 2025-07-24T15:20:18.000+02:00
feat(MeshHelpers): convert raster info grid
diff --git a/include/geode/geometry/point.hpp b/include/geode/geometry/point.hpp
@@ -76,7 +76,7 @@ namespace geode
         [[nodiscard]] std::string string() const;
 
         [[nodiscard]] Point< dimension - 1 > project_point(
-            geode::local_index_t axis_to_remove ) const;
+            local_index_t axis_to_remove ) const;
 
     private:
         friend class bitsery::Access;
diff --git a/include/geode/mesh/helpers/convert_edged_curve.hpp b/include/geode/mesh/helpers/convert_edged_curve.hpp
@@ -39,11 +39,11 @@ namespace geode
 {
     [[nodiscard]] std::unique_ptr< EdgedCurve2D >
         opengeode_mesh_api convert_edged_curve3d_into_2d(
-            const EdgedCurve3D& curve3d, index_t axis_to_remove );
+            const EdgedCurve3D& curve3d, local_index_t axis_to_remove );
 
     [[nodiscard]] std::unique_ptr< EdgedCurve3D > opengeode_mesh_api
         convert_edged_curve2d_into_3d( const EdgedCurve2D& curve2d,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate );
 
     template < index_t dimension >
diff --git a/include/geode/mesh/helpers/convert_grid.hpp b/include/geode/mesh/helpers/convert_grid.hpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019 - 2025 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#pragma once
+
+#include <geode/mesh/common.hpp>
+
+namespace geode
+{
+    FORWARD_DECLARATION_DIMENSION_CLASS( CoordinateSystem );
+    FORWARD_DECLARATION_DIMENSION_CLASS( LightRegularGrid );
+    FORWARD_DECLARATION_DIMENSION_CLASS( RasterImage );
+} // namespace geode
+
+namespace geode
+{
+    template < index_t dimension >
+    [[nodiscard]] LightRegularGrid< dimension > convert_raster_image_into_grid(
+        const RasterImage< dimension >& raster,
+        const CoordinateSystem< dimension >& coordinate_system );
+} // namespace geode
diff --git a/include/geode/mesh/helpers/convert_point_set.hpp b/include/geode/mesh/helpers/convert_point_set.hpp
@@ -37,10 +37,10 @@ namespace geode
 {
     [[nodiscard]] std::unique_ptr< PointSet2D >
         opengeode_mesh_api convert_point_set3d_into_2d(
-            const PointSet3D& point_set3d, index_t axis_to_remove );
+            const PointSet3D& point_set3d, local_index_t axis_to_remove );
 
     [[nodiscard]] std::unique_ptr< PointSet3D > opengeode_mesh_api
         convert_point_set2d_into_3d( const PointSet2D& point_set2d,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate );
 } // namespace geode
diff --git a/include/geode/mesh/helpers/convert_surface_mesh.hpp b/include/geode/mesh/helpers/convert_surface_mesh.hpp
@@ -58,6 +58,9 @@ namespace geode
     [[nodiscard]] std::unique_ptr< TriangulatedSurface2D > opengeode_mesh_api
         convert_grid_into_triangulated_surface( const Grid2D& grid );
 
+    [[nodiscard]] std::unique_ptr< PolygonalSurface2D > opengeode_mesh_api
+        convert_grid_into_polygonal_surface( const Grid2D& grid );
+
     [[nodiscard]] std::unique_ptr< TriangulatedSurface2D > opengeode_mesh_api
         convert_grid_into_densified_triangulated_surface( const Grid2D& grid,
             absl::Span< const geode::index_t > cells_to_densify );
@@ -71,32 +74,33 @@ namespace geode
 
     [[nodiscard]] std::unique_ptr< SurfaceMesh3D > opengeode_mesh_api
         convert_surface_mesh2d_into_3d( const SurfaceMesh2D& surface2d,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate );
 
     [[nodiscard]] std::unique_ptr< SurfaceMesh2D >
         opengeode_mesh_api convert_surface_mesh3d_into_2d(
-            const SurfaceMesh3D& surface3d, index_t axis_to_remove );
+            const SurfaceMesh3D& surface3d, local_index_t axis_to_remove );
 
     [[nodiscard]] std::unique_ptr< PolygonalSurface3D >
         opengeode_mesh_api convert_polygonal_surface2d_into_3d(
             const PolygonalSurface2D& surface2d,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate );
 
     [[nodiscard]] std::unique_ptr< PolygonalSurface2D >
         opengeode_mesh_api convert_polygonal_surface3d_into_2d(
-            const PolygonalSurface3D& surface3d, index_t axis_to_remove );
+            const PolygonalSurface3D& surface3d, local_index_t axis_to_remove );
 
     [[nodiscard]] std::unique_ptr< TriangulatedSurface3D >
         opengeode_mesh_api convert_triangulated_surface2d_into_3d(
             const TriangulatedSurface2D& surface2d,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate );
 
     [[nodiscard]] std::unique_ptr< TriangulatedSurface2D >
         opengeode_mesh_api convert_triangulated_surface3d_into_2d(
-            const TriangulatedSurface3D& surface3d, index_t axis_to_remove );
+            const TriangulatedSurface3D& surface3d,
+            local_index_t axis_to_remove );
 
     template < index_t dimension >
     [[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > >
diff --git a/include/geode/mesh/helpers/internal/copy.hpp b/include/geode/mesh/helpers/internal/copy.hpp
@@ -37,8 +37,9 @@ namespace geode
     namespace internal
     {
         template < typename MeshFrom, typename Builder >
-        void copy_points3d_into_2d(
-            const MeshFrom& from, Builder& builder, index_t axis_to_remove )
+        void copy_points3d_into_2d( const MeshFrom& from,
+            Builder& builder,
+            local_index_t axis_to_remove )
         {
             OPENGEODE_EXCEPTION( axis_to_remove < 3,
                 "[copy_points3d_into_2d] Invalid axis to remove." );
@@ -47,16 +48,15 @@ namespace geode
                 async::irange( index_t{ 0 }, from.nb_vertices() ),
                 [&from, &builder, axis_to_remove]( index_t v ) {
                     const auto& pt_3d = from.point( v );
-                    builder.set_point( v,
-                        Point2D{ { pt_3d.value( axis_to_remove == 0 ? 1 : 0 ),
-                            pt_3d.value( axis_to_remove == 2 ? 1 : 2 ) } } );
+                    builder.set_point(
+                        v, pt_3d.project_point( axis_to_remove ) );
                 } );
         }
 
         template < typename MeshFrom, typename Builder >
         void copy_points2d_into_3d( const MeshFrom& from,
             Builder& builder,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate )
         {
             OPENGEODE_EXCEPTION( axis_to_add < 3,
diff --git a/include/geode/mesh/io/edged_curve_input.hpp b/include/geode/mesh/io/edged_curve_input.hpp
@@ -73,6 +73,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( EdgedCurveInput );
 
     template < index_t dimension >
     [[nodiscard]] typename EdgedCurveInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/edged_curve_output.hpp b/include/geode/mesh/io/edged_curve_output.hpp
@@ -58,6 +58,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( EdgedCurveOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_edged_curve_saveable(
diff --git a/include/geode/mesh/io/hybrid_solid_input.hpp b/include/geode/mesh/io/hybrid_solid_input.hpp
@@ -76,6 +76,7 @@ namespace geode
         {
         }
     };
+    ALIAS_3D( HybridSolidInput );
 
     template < index_t dimension >
     [[nodiscard]] typename HybridSolidInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/hybrid_solid_output.hpp b/include/geode/mesh/io/hybrid_solid_output.hpp
@@ -61,6 +61,7 @@ namespace geode
         {
         }
     };
+    ALIAS_3D( HybridSolidOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_hybrid_solid_saveable(
diff --git a/include/geode/mesh/io/point_set_input.hpp b/include/geode/mesh/io/point_set_input.hpp
@@ -73,6 +73,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( PointSetInput );
 
     template < index_t dimension >
     [[nodiscard]] typename PointSetInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/point_set_output.hpp b/include/geode/mesh/io/point_set_output.hpp
@@ -58,6 +58,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( PointSetOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_point_set_saveable(
diff --git a/include/geode/mesh/io/polygonal_surface_input.hpp b/include/geode/mesh/io/polygonal_surface_input.hpp
@@ -76,6 +76,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( PolygonalSurfaceInput );
 
     template < index_t dimension >
     [[nodiscard]] typename PolygonalSurfaceInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/polygonal_surface_output.hpp b/include/geode/mesh/io/polygonal_surface_output.hpp
@@ -61,6 +61,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( PolygonalSurfaceOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_polygonal_surface_saveable(
diff --git a/include/geode/mesh/io/polyhedral_solid_input.hpp b/include/geode/mesh/io/polyhedral_solid_input.hpp
@@ -78,6 +78,7 @@ namespace geode
         {
         }
     };
+    ALIAS_3D( PolyhedralSolidInput );
 
     template < index_t dimension >
     [[nodiscard]] typename PolyhedralSolidInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/polyhedral_solid_output.hpp b/include/geode/mesh/io/polyhedral_solid_output.hpp
@@ -61,6 +61,7 @@ namespace geode
         {
         }
     };
+    ALIAS_3D( PolyhedralSolidOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_polyhedral_solid_saveable(
diff --git a/include/geode/mesh/io/regular_grid_input.hpp b/include/geode/mesh/io/regular_grid_input.hpp
@@ -73,6 +73,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( RegularGridInput );
 
     template < index_t dimension >
     [[nodiscard]] typename RegularGridInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/regular_grid_output.hpp b/include/geode/mesh/io/regular_grid_output.hpp
@@ -59,6 +59,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( RegularGridOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_regular_grid_saveable(
diff --git a/include/geode/mesh/io/tetrahedral_solid_input.hpp b/include/geode/mesh/io/tetrahedral_solid_input.hpp
@@ -78,6 +78,7 @@ namespace geode
         {
         }
     };
+    ALIAS_3D( TetrahedralSolidInput );
 
     template < index_t dimension >
     [[nodiscard]] typename TetrahedralSolidInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/tetrahedral_solid_output.hpp b/include/geode/mesh/io/tetrahedral_solid_output.hpp
@@ -62,6 +62,7 @@ namespace geode
         {
         }
     };
+    ALIAS_3D( TetrahedralSolidOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_tetrahedral_solid_saveable(
diff --git a/include/geode/mesh/io/triangulated_surface_input.hpp b/include/geode/mesh/io/triangulated_surface_input.hpp
@@ -76,6 +76,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( TriangulatedSurfaceInput );
 
     template < index_t dimension >
     [[nodiscard]] typename TriangulatedSurfaceInput< dimension >::MissingFiles
diff --git a/include/geode/mesh/io/triangulated_surface_output.hpp b/include/geode/mesh/io/triangulated_surface_output.hpp
@@ -60,6 +60,7 @@ namespace geode
         {
         }
     };
+    ALIAS_2D_AND_3D( TriangulatedSurfaceOutput );
 
     template < index_t dimension >
     [[nodiscard]] bool is_triangulated_surface_saveable(
diff --git a/include/geode/model/helpers/convert_brep_section.hpp b/include/geode/model/helpers/convert_brep_section.hpp
@@ -34,18 +34,19 @@ namespace geode
 
 namespace geode
 {
-    [[nodiscard]] std::tuple< Section, ModelCopyMapping > opengeode_model_api
-        convert_brep_into_section( const BRep& brep, index_t axis_to_remove );
+    [[nodiscard]] std::tuple< Section, ModelCopyMapping >
+        opengeode_model_api convert_brep_into_section(
+            const BRep& brep, local_index_t axis_to_remove );
 
     [[nodiscard]] std::tuple< BRep, ModelCopyMapping >
         opengeode_model_api convert_section_into_brep( const Section& section,
-            index_t axis_to_add,
+            local_index_t axis_to_add,
             double axis_coordinate );
 
-    struct opengeode_model_api SectionExtruderOptions
+    struct SectionExtruderOptions
     {
         SectionExtruderOptions() = default;
-        index_t axis_to_extrude{ NO_ID };
+        local_index_t axis_to_extrude{ NO_LID };
         double min_coordinate{ 0. };
         double max_coordinate{ 0. };
     };
diff --git a/src/geode/mesh/CMakeLists.txt b/src/geode/mesh/CMakeLists.txt
@@ -102,6 +102,7 @@ add_geode_library(
         "helpers/aabb_solid_helpers.cpp"
         "helpers/build_grid.cpp"
         "helpers/convert_edged_curve.cpp"
+        "helpers/convert_grid.cpp"
         "helpers/convert_point_set.cpp"
         "helpers/convert_surface_mesh.cpp"
         "helpers/convert_solid_mesh.cpp"
@@ -239,6 +240,7 @@ add_geode_library(
         "helpers/aabb_solid_helpers.hpp"
         "helpers/build_grid.hpp"
         "helpers/convert_edged_curve.hpp"
+        "helpers/convert_grid.hpp"
         "helpers/convert_point_set.hpp"
         "helpers/convert_surface_mesh.hpp"
         "helpers/convert_solid_mesh.hpp"
diff --git a/src/geode/mesh/helpers/convert_edged_curve.cpp b/src/geode/mesh/helpers/convert_edged_curve.cpp
@@ -48,7 +48,7 @@ namespace
 namespace geode
 {
     std::unique_ptr< EdgedCurve2D > convert_edged_curve3d_into_2d(
-        const EdgedCurve3D& curve3d, index_t axis_to_remove )
+        const EdgedCurve3D& curve3d, local_index_t axis_to_remove )
     {
         auto curve2d = EdgedCurve2D::create();
         auto builder2d = EdgedCurveBuilder2D::create( *curve2d );
@@ -64,7 +64,7 @@ namespace geode
 
     std::unique_ptr< EdgedCurve3D > convert_edged_curve2d_into_3d(
         const EdgedCurve2D& curve2d,
-        index_t axis_to_add,
+        local_index_t axis_to_add,
         double axis_coordinate )
     {
         auto curve3d = EdgedCurve3D::create();
diff --git a/src/geode/mesh/helpers/convert_grid.cpp b/src/geode/mesh/helpers/convert_grid.cpp
diff --git a/src/geode/mesh/helpers/convert_point_set.cpp b/src/geode/mesh/helpers/convert_point_set.cpp
diff --git a/src/geode/mesh/helpers/convert_surface_mesh.cpp b/src/geode/mesh/helpers/convert_surface_mesh.cpp
diff --git a/src/geode/model/helpers/convert_brep_section.cpp b/src/geode/model/helpers/convert_brep_section.cpp

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ namespace geode`
`73`	`73`	`{`
`74`	`74`	`}`
`75`	`75`	`};`
	`76`	`+ ALIAS_2D_AND_3D( EdgedCurveInput );`
`76`	`77`
`77`	`78`	`template < index_t dimension >`
`78`	`79`	`[[nodiscard]] typename EdgedCurveInput< dimension >::MissingFiles`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ namespace geode`
`58`	`58`	`{`
`59`	`59`	`}`
`60`	`60`	`};`
	`61`	`+ ALIAS_2D_AND_3D( EdgedCurveOutput );`
`61`	`62`
`62`	`63`	`template < index_t dimension >`
`63`	`64`	`[[nodiscard]] bool is_edged_curve_saveable(`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ namespace geode`
`76`	`76`	`{`
`77`	`77`	`}`
`78`	`78`	`};`
	`79`	`+ ALIAS_3D( HybridSolidInput );`
`79`	`80`
`80`	`81`	`template < index_t dimension >`
`81`	`82`	`[[nodiscard]] typename HybridSolidInput< dimension >::MissingFiles`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ namespace geode`
`61`	`61`	`{`
`62`	`62`	`}`
`63`	`63`	`};`
	`64`	`+ ALIAS_3D( HybridSolidOutput );`
`64`	`65`
`65`	`66`	`template < index_t dimension >`
`66`	`67`	`[[nodiscard]] bool is_hybrid_solid_saveable(`