Merge branch 'next' into base/sharp-features

BenPinet · BenPinet · commit 2f12709db9a8 · 2025-04-18T17:39:04.000+02:00
diff --git a/cmake/GlobalOptions.cmake b/cmake/GlobalOptions.cmake
@@ -17,6 +17,9 @@ include(InstallRequiredSystemLibraries)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_COLOR_DIAGNOSTICS ON)
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
+    set(CMAKE_LINKER_TYPE "SYSTEM")
+endif()
 
 find_program(CLANG_TIDY "clang-tidy")
 if(CLANG_TIDY)
diff --git a/include/geode/basic/assert.hpp b/include/geode/basic/assert.hpp
@@ -59,10 +59,11 @@ namespace geode
     public:
         template < typename... Args >
         explicit OpenGeodeException( const Args&... message )
-            : std::runtime_error{ absl::StrCat( message... ) },
-              stack_size_{ absl::GetStackTrace(
-                  stack_.data(), MAX_STACK_DEPTH, NB_SKIPPED_STACKS ) }
+            : std::runtime_error{ absl::StrCat( message... ) }
         {
+            stack_.fill( nullptr );
+            stack_size_ = absl::GetStackTrace(
+                stack_.data(), MAX_STACK_DEPTH, NB_SKIPPED_STACKS );
         }
 
         ~OpenGeodeException() noexcept override = default;
diff --git a/include/geode/geometry/basic_objects/tetrahedron.hpp b/include/geode/geometry/basic_objects/tetrahedron.hpp
@@ -32,6 +32,7 @@ namespace geode
     FORWARD_DECLARATION_DIMENSION_CLASS( Point );
     ALIAS_3D( BoundingBox );
     ALIAS_3D( Point );
+    class Tetrahedron;
     class OwnerTetrahedron;
 
     template < index_t dimension >
@@ -82,6 +83,7 @@ namespace geode
             Point3D point2,
             Point3D point3 ) noexcept;
 
+        OwnerTetrahedron( const Tetrahedron& other ) noexcept;
         OwnerTetrahedron( const OwnerTetrahedron& other ) noexcept;
         OwnerTetrahedron& operator=( const OwnerTetrahedron& other ) noexcept;
         OwnerTetrahedron( OwnerTetrahedron&& other ) noexcept;
@@ -111,10 +113,10 @@ namespace geode
     public:
         template < typename... Args >
         explicit OpenGeodeTetrahedronException(
-            Tetrahedron tetrahedron_in, const Args&... message )
+            const Tetrahedron& tetrahedron_in, const Args&... message )
             : OpenGeodeException{ absl::StrCat(
                   message..., " at ", tetrahedron_in.string() ) },
-              tetrahedron{ std::move( tetrahedron_in ) }
+              tetrahedron{ tetrahedron_in }
         {
         }
 
diff --git a/include/geode/mesh/builder/geode/geode_vertex_set_builder.hpp b/include/geode/mesh/builder/geode/geode_vertex_set_builder.hpp
@@ -61,6 +61,6 @@ namespace geode
             absl::Span< const index_t > old2new ) final;
 
     private:
-        OpenGeodeVertexSet& geode_vertex_set_;
+        [[maybe_unused]] OpenGeodeVertexSet& geode_vertex_set_;
     };
 } // namespace geode
diff --git a/include/geode/mesh/core/internal/grid_impl.hpp b/include/geode/mesh/core/internal/grid_impl.hpp
@@ -125,7 +125,7 @@ namespace geode
             for( const auto v : Range{ nv } )
             {
                 tasks[task_id++] =
-                    async::spawn( [&builder, &origin, v, du, dv, nu, nv] {
+                    async::spawn( [&builder, &origin, v, du, dv, nu] {
                         for( const auto u : Range{ nu } )
                         {
                             const auto vertex = u + v * nu;
@@ -156,7 +156,7 @@ namespace geode
             for( const auto v : Range{ nv } )
             {
                 tasks[task_id++] = async::spawn(
-                    [&builder, &origin, v, &vector_u, &vector_v, nu, nv] {
+                    [&builder, &origin, v, &vector_u, &vector_v, nu] {
                         for( const auto u : Range{ nu } )
                         {
                             const auto vertex = u + v * nu;
@@ -188,17 +188,16 @@ namespace geode
             {
                 for( const auto v : Range{ nv } )
                 {
-                    tasks[task_id++] = async::spawn(
-                        [&builder, &origin, v, w, du, dv, dw, nu, nv, nw] {
-                            for( const auto u : Range{ nu } )
-                            {
-                                const auto vertex = u + v * nu + w * nu * nv;
-                                const Point3D translation{ { u * du, v * dv,
-                                    w * dw } };
-                                builder.set_point(
-                                    vertex, origin + translation );
-                            }
-                        } );
+                    tasks[task_id++] = async::spawn( [&builder, &origin, v, w,
+                                                         du, dv, dw, nu, nv] {
+                        for( const auto u : Range{ nu } )
+                        {
+                            const auto vertex = u + v * nu + w * nu * nv;
+                            const Point3D translation{ { u * du, v * dv,
+                                w * dw } };
+                            builder.set_point( vertex, origin + translation );
+                        }
+                    } );
                 }
             }
             for( auto& task : async::when_all( tasks ).get() )
@@ -228,7 +227,7 @@ namespace geode
                 {
                     tasks[task_id++] =
                         async::spawn( [&builder, &origin, v, w, &vector_u,
-                                          &vector_v, &vector_w, nu, nv, nw] {
+                                          &vector_v, &vector_w, nu, nv] {
                             for( const auto u : Range{ nu } )
                             {
                                 const auto vertex = u + v * nu + w * nu * nv;
diff --git a/include/geode/model/representation/builder/brep_builder.hpp b/include/geode/model/representation/builder/brep_builder.hpp
@@ -230,16 +230,16 @@ namespace geode
             const Surface3D& surface, const ModelBoundary3D& boundary );
 
         void add_corner_in_corner_collection(
-            const Corner3D& surface, const CornerCollection3D& collection );
+            const Corner3D& corner, const CornerCollection3D& collection );
 
         void add_line_in_line_collection(
-            const Line3D& surface, const LineCollection3D& collection );
+            const Line3D& line, const LineCollection3D& collection );
 
         void add_surface_in_surface_collection(
             const Surface3D& surface, const SurfaceCollection3D& collection );
 
         void add_block_in_block_collection(
-            const Block3D& surface, const BlockCollection3D& collection );
+            const Block3D& block, const BlockCollection3D& collection );
 
         void set_point( index_t unique_vertex, const Point3D& point );
 
diff --git a/src/geode/geometry/basic_objects/tetrahedron.cpp b/src/geode/geometry/basic_objects/tetrahedron.cpp
@@ -117,6 +117,14 @@ namespace geode
         : Base( point0, point1, point2, point3 )
     {
     }
+    OwnerTetrahedron::OwnerTetrahedron( const Tetrahedron& other ) noexcept
+        : Base( other.vertices()[0],
+              other.vertices()[1],
+              other.vertices()[2],
+              other.vertices()[3] )
+    {
+    }
+
     OwnerTetrahedron::OwnerTetrahedron(
         const OwnerTetrahedron& ) noexcept = default;
     OwnerTetrahedron& OwnerTetrahedron::operator=(
diff --git a/src/geode/geometry/bounding_box.cpp b/src/geode/geometry/bounding_box.cpp
@@ -292,7 +292,7 @@ namespace geode
 
     template <>
     template <>
-    bool BoundingBox< 3 >::intersects< 3 >(
+    bool opengeode_geometry_api BoundingBox< 3 >::intersects< 3 >(
         const Triangle< 3 >& triangle ) const
     {
         const auto& vertices = triangle.vertices();
@@ -382,7 +382,7 @@ namespace geode
 
     template <>
     template <>
-    bool BoundingBox< 2 >::intersects< 2 >(
+    bool opengeode_geometry_api BoundingBox< 2 >::intersects< 2 >(
         const Triangle< 2 >& triangle ) const
     {
         if( point_triangle_position( center(), triangle ) == POSITION::inside )
@@ -512,10 +512,6 @@ namespace geode
     template class opengeode_geometry_api BoundingBox< 2 >;
     template class opengeode_geometry_api BoundingBox< 3 >;
 
-    template opengeode_geometry_api bool BoundingBox< 2 >::intersects< 2 >(
-        const Triangle< 2 >& ) const;
-    template opengeode_geometry_api bool BoundingBox< 3 >::intersects< 3 >(
-        const Triangle< 3 >& ) const;
     template opengeode_geometry_api bool BoundingBox< 3 >::intersects< 3 >(
         const Tetrahedron& ) const;
 } // namespace geode
diff --git a/src/geode/geometry/distance.cpp b/src/geode/geometry/distance.cpp
@@ -30,6 +30,7 @@
 
 #include <geode/geometry/barycentric_coordinates.hpp>
 #include <geode/geometry/basic_objects/circle.hpp>
+#include <geode/geometry/basic_objects/ellipse.hpp>
 #include <geode/geometry/basic_objects/infinite_line.hpp>
 #include <geode/geometry/basic_objects/plane.hpp>
 #include <geode/geometry/basic_objects/segment.hpp>
@@ -846,8 +847,9 @@ namespace geode
     }
 
     template <>
-    std::tuple< double, Point3D > point_triangle_distance(
-        const Point3D& point, const Triangle3D& triangle )
+    std::tuple< double, Point3D >
+        opengeode_geometry_api point_triangle_distance(
+            const Point3D& point, const Triangle3D& triangle )
     {
         if( const auto pivot = triangle.pivot() )
         {
@@ -858,8 +860,9 @@ namespace geode
     }
 
     template <>
-    std::tuple< double, Point2D > point_triangle_distance(
-        const Point2D& point, const Triangle2D& triangle )
+    std::tuple< double, Point2D >
+        opengeode_geometry_api point_triangle_distance(
+            const Point2D& point, const Triangle2D& triangle )
     {
         if( may_point_be_in_triangle( point, triangle ) )
         {
@@ -1565,8 +1568,6 @@ namespace geode
         segment_line_distance( const Segment2D&, const InfiniteLine2D& );
     template double opengeode_geometry_api point_line_distance(
         const Point2D&, const InfiniteLine2D& );
-    template std::tuple< double, Point2D > opengeode_geometry_api
-        point_triangle_distance( const Point2D&, const Triangle2D& );
     template std::tuple< double, Point2D > opengeode_geometry_api
         point_sphere_distance( const Point2D&, const Sphere2D& );
     template std::tuple< double, Point2D > opengeode_geometry_api
@@ -1586,8 +1587,6 @@ namespace geode
         segment_line_distance( const Segment3D&, const InfiniteLine3D& );
     template double opengeode_geometry_api point_line_distance(
         const Point3D&, const InfiniteLine3D& );
-    template std::tuple< double, Point3D > opengeode_geometry_api
-        point_triangle_distance( const Point3D&, const Triangle3D& );
     template std::tuple< double, Point3D > opengeode_geometry_api
         point_sphere_distance( const Point3D&, const Sphere3D& );
     template std::tuple< double, Point3D > opengeode_geometry_api
diff --git a/src/geode/mesh/core/light_regular_grid.cpp b/src/geode/mesh/core/light_regular_grid.cpp
@@ -26,6 +26,7 @@
 #include <geode/basic/logger.hpp>
 #include <geode/basic/pimpl_impl.hpp>
 
+#include <geode/geometry/bounding_box.hpp>
 #include <geode/geometry/point.hpp>
 #include <geode/geometry/vector.hpp>
 
diff --git a/src/geode/mesh/helpers/convert_solid_mesh.cpp b/src/geode/mesh/helpers/convert_solid_mesh.cpp
diff --git a/src/geode/model/mixin/core/relationships.cpp b/src/geode/model/mixin/core/relationships.cpp
diff --git a/src/geode/model/representation/io/geode/geode_section_output.cpp b/src/geode/model/representation/io/geode/geode_section_output.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
`@@ -59,10 +59,11 @@ namespace geode`
`59`	`59`	`public:`
`60`	`60`	`template < typename... Args >`
`61`	`61`	`explicit OpenGeodeException( const Args&... message )`
`62`		`- : std::runtime_error{ absl::StrCat( message... ) },`
`63`		`- stack_size_{ absl::GetStackTrace(`
`64`		`- stack_.data(), MAX_STACK_DEPTH, NB_SKIPPED_STACKS ) }`
	`62`	`+ : std::runtime_error{ absl::StrCat( message... ) }`
`65`	`63`	`{`
	`64`	`+ stack_.fill( nullptr );`
	`65`	`+ stack_size_ = absl::GetStackTrace(`
	`66`	`+ stack_.data(), MAX_STACK_DEPTH, NB_SKIPPED_STACKS );`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`~OpenGeodeException() noexcept override = default;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ namespace geode`
`125`	`125`	`for( const auto v : Range{ nv } )`
`126`	`126`	`{`
`127`	`127`	`tasks[task_id++] =`
`128`		`- async::spawn( [&builder, &origin, v, du, dv, nu, nv] {`
	`128`	`+ async::spawn( [&builder, &origin, v, du, dv, nu] {`
`129`	`129`	`for( const auto u : Range{ nu } )`
`130`	`130`	`{`
`131`	`131`	`const auto vertex = u + v * nu;`
`@@ -156,7 +156,7 @@ namespace geode`
`156`	`156`	`for( const auto v : Range{ nv } )`
`157`	`157`	`{`
`158`	`158`	`tasks[task_id++] = async::spawn(`
`159`		`- [&builder, &origin, v, &vector_u, &vector_v, nu, nv] {`
	`159`	`+ [&builder, &origin, v, &vector_u, &vector_v, nu] {`
`160`	`160`	`for( const auto u : Range{ nu } )`
`161`	`161`	`{`
`162`	`162`	`const auto vertex = u + v * nu;`
`@@ -188,17 +188,16 @@ namespace geode`
`188`	`188`	`{`
`189`	`189`	`for( const auto v : Range{ nv } )`
`190`	`190`	`{`
`191`		`- tasks[task_id++] = async::spawn(`
`192`		`- [&builder, &origin, v, w, du, dv, dw, nu, nv, nw] {`
`193`		`- for( const auto u : Range{ nu } )`
`194`		`- {`
`195`		`- const auto vertex = u + v * nu + w * nu * nv;`
`196`		`- const Point3D translation{ { u * du, v * dv,`
`197`		`- w * dw } };`
`198`		`- builder.set_point(`
`199`		`- vertex, origin + translation );`
`200`		`- }`
`201`		`- } );`
	`191`	`+ tasks[task_id++] = async::spawn( [&builder, &origin, v, w,`
	`192`	`+ du, dv, dw, nu, nv] {`
	`193`	`+ for( const auto u : Range{ nu } )`
	`194`	`+ {`
	`195`	`+ const auto vertex = u + v * nu + w * nu * nv;`
	`196`	`+ const Point3D translation{ { u * du, v * dv,`
	`197`	`+ w * dw } };`
	`198`	`+ builder.set_point( vertex, origin + translation );`
	`199`	`+ }`
	`200`	`+ } );`
`202`	`201`	`}`
`203`	`202`	`}`
`204`	`203`	`for( auto& task : async::when_all( tasks ).get() )`
`@@ -228,7 +227,7 @@ namespace geode`
`228`	`227`	`{`
`229`	`228`	`tasks[task_id++] =`
`230`	`229`	`async::spawn( [&builder, &origin, v, w, &vector_u,`
`231`		`- &vector_v, &vector_w, nu, nv, nw] {`
	`230`	`+ &vector_v, &vector_w, nu, nv] {`
`232`	`231`	`for( const auto u : Range{ nu } )`
`233`	`232`	`{`
`234`	`233`	`const auto vertex = u + v * nu + w * nu * nv;`