Merge pull request #1081 from Geode-solutions/fix/move-builder

MelchiorSchuh · web-flow · commit a1ef2cdcb5e4 · 2025-02-04T14:57:53.000+01:00
fix(Builder): allow to move builders
diff --git a/include/geode/mesh/builder/edged_curve_builder.hpp b/include/geode/mesh/builder/edged_curve_builder.hpp
@@ -46,6 +46,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        EdgedCurveBuilder( EdgedCurveBuilder&& ) noexcept = default;
+
         /*!
          * Create the builder associated with an EdgedCurve.
          * @param[in] mesh The EdgedCurve to build/modify
diff --git a/include/geode/mesh/builder/geode/geode_edged_curve_builder.hpp b/include/geode/mesh/builder/geode/geode_edged_curve_builder.hpp
@@ -52,6 +52,8 @@ namespace geode
         explicit OpenGeodeEdgedCurveBuilder(
             OpenGeodeEdgedCurve< dimension >& mesh );
 
+        OpenGeodeEdgedCurveBuilder( OpenGeodeEdgedCurveBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_graph_builder.hpp b/include/geode/mesh/builder/geode/geode_graph_builder.hpp
@@ -46,6 +46,8 @@ namespace geode
 
         explicit OpenGeodeGraphBuilder( OpenGeodeGraph& mesh );
 
+        OpenGeodeGraphBuilder( OpenGeodeGraphBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_hybrid_solid_builder.hpp b/include/geode/mesh/builder/geode/geode_hybrid_solid_builder.hpp
@@ -55,6 +55,8 @@ namespace geode
         explicit OpenGeodeHybridSolidBuilder(
             OpenGeodeHybridSolid< dimension >& mesh );
 
+        OpenGeodeHybridSolidBuilder( OpenGeodeHybridSolidBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_point_set_builder.hpp b/include/geode/mesh/builder/geode/geode_point_set_builder.hpp
@@ -52,6 +52,8 @@ namespace geode
         explicit OpenGeodePointSetBuilder(
             OpenGeodePointSet< dimension >& mesh );
 
+        OpenGeodePointSetBuilder( OpenGeodePointSetBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_polygonal_surface_builder.hpp b/include/geode/mesh/builder/geode/geode_polygonal_surface_builder.hpp
@@ -54,6 +54,9 @@ namespace geode
         explicit OpenGeodePolygonalSurfaceBuilder(
             OpenGeodePolygonalSurface< dimension >& mesh );
 
+        OpenGeodePolygonalSurfaceBuilder(
+            OpenGeodePolygonalSurfaceBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_polyhedral_solid_builder.hpp b/include/geode/mesh/builder/geode/geode_polyhedral_solid_builder.hpp
@@ -56,6 +56,9 @@ namespace geode
         explicit OpenGeodePolyhedralSolidBuilder(
             OpenGeodePolyhedralSolid< dimension >& mesh );
 
+        OpenGeodePolyhedralSolidBuilder(
+            OpenGeodePolyhedralSolidBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_regular_grid_solid_builder.hpp b/include/geode/mesh/builder/geode/geode_regular_grid_solid_builder.hpp
@@ -53,6 +53,8 @@ namespace geode
 
         explicit OpenGeodeRegularGridBuilder( OpenGeodeRegularGrid< 3 >& mesh );
 
+        OpenGeodeRegularGridBuilder( OpenGeodeRegularGridBuilder&& ) noexcept;
+
     private:
         void update_origin( const Point3D& origin ) final;
 
diff --git a/include/geode/mesh/builder/geode/geode_regular_grid_surface_builder.hpp b/include/geode/mesh/builder/geode/geode_regular_grid_surface_builder.hpp
@@ -53,6 +53,8 @@ namespace geode
 
         explicit OpenGeodeRegularGridBuilder( OpenGeodeRegularGrid< 2 >& mesh );
 
+        OpenGeodeRegularGridBuilder( OpenGeodeRegularGridBuilder&& ) noexcept;
+
     private:
         void update_origin( const Point2D& origin ) final;
 
diff --git a/include/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.hpp b/include/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.hpp
@@ -57,6 +57,9 @@ namespace geode
         explicit OpenGeodeTetrahedralSolidBuilder(
             OpenGeodeTetrahedralSolid< dimension >& mesh );
 
+        OpenGeodeTetrahedralSolidBuilder(
+            OpenGeodeTetrahedralSolidBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_triangulated_surface_builder.hpp b/include/geode/mesh/builder/geode/geode_triangulated_surface_builder.hpp
@@ -54,6 +54,9 @@ namespace geode
         explicit OpenGeodeTriangulatedSurfaceBuilder(
             OpenGeodeTriangulatedSurface< dimension >& mesh );
 
+        OpenGeodeTriangulatedSurfaceBuilder(
+            OpenGeodeTriangulatedSurfaceBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/geode/geode_vertex_set_builder.hpp b/include/geode/mesh/builder/geode/geode_vertex_set_builder.hpp
@@ -47,6 +47,8 @@ namespace geode
 
         explicit OpenGeodeVertexSetBuilder( OpenGeodeVertexSet& mesh );
 
+        OpenGeodeVertexSetBuilder( OpenGeodeVertexSetBuilder&& ) noexcept;
+
     private:
         void do_create_vertex() final;
 
diff --git a/include/geode/mesh/builder/graph_builder.hpp b/include/geode/mesh/builder/graph_builder.hpp
@@ -44,6 +44,8 @@ namespace geode
     class opengeode_mesh_api GraphBuilder : public VertexSetBuilder
     {
     public:
+        GraphBuilder( GraphBuilder&& ) noexcept = default;
+
         /*!
          * Create the builder associated with a Graph.
          * @param[in] mesh The Graph to build/modify
diff --git a/include/geode/mesh/builder/grid_builder.hpp b/include/geode/mesh/builder/grid_builder.hpp
@@ -44,6 +44,8 @@ namespace geode
 
         explicit GridBuilder( Grid< dimension >& grid );
 
+        GridBuilder( GridBuilder&& ) noexcept = default;
+
         void set_grid_origin( Point< dimension > origin );
 
         void set_grid_dimensions( std::array< index_t, dimension > cells_number,
diff --git a/include/geode/mesh/builder/hybrid_solid_builder.hpp b/include/geode/mesh/builder/hybrid_solid_builder.hpp
@@ -44,6 +44,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        HybridSolidBuilder( HybridSolidBuilder&& ) noexcept = default;
+
         [[nodiscard]] static std::unique_ptr< HybridSolidBuilder< dimension > >
             create( HybridSolid< dimension >& mesh );
 
diff --git a/include/geode/mesh/builder/point_set_builder.hpp b/include/geode/mesh/builder/point_set_builder.hpp
@@ -48,6 +48,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        PointSetBuilder( PointSetBuilder&& ) noexcept = default;
+
         /*!
          * Create the builder associated with a PointSet.
          * @param[in] mesh The PointSet to build/modify
diff --git a/include/geode/mesh/builder/polygonal_surface_builder.hpp b/include/geode/mesh/builder/polygonal_surface_builder.hpp
@@ -46,6 +46,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        PolygonalSurfaceBuilder( PolygonalSurfaceBuilder&& ) noexcept = default;
+
         /*!
          * Create the builder associated with a PolygonalSurface.
          * @param[in] mesh The PolygonalSurface to build/modify
diff --git a/include/geode/mesh/builder/polyhedral_solid_builder.hpp b/include/geode/mesh/builder/polyhedral_solid_builder.hpp
@@ -47,6 +47,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        PolyhedralSolidBuilder( PolyhedralSolidBuilder&& ) noexcept = default;
+
         /*!
          * Create the builder associated with a PolyhedralSolid.
          * @param[in] mesh The PolyhedralSolid to build/modify
diff --git a/include/geode/mesh/builder/regular_grid_solid_builder.hpp b/include/geode/mesh/builder/regular_grid_solid_builder.hpp
@@ -47,6 +47,8 @@ namespace geode
     public:
         static constexpr index_t dim{ 3 };
 
+        RegularGridBuilder( RegularGridBuilder&& ) noexcept = default;
+
         [[nodiscard]] static std::unique_ptr< RegularGridBuilder< 3 > > create(
             RegularGrid3D& grid );
 
diff --git a/include/geode/mesh/builder/regular_grid_surface_builder.hpp b/include/geode/mesh/builder/regular_grid_surface_builder.hpp
@@ -47,6 +47,8 @@ namespace geode
     public:
         static constexpr index_t dim{ 2 };
 
+        RegularGridBuilder( RegularGridBuilder&& ) noexcept = default;
+
         [[nodiscard]] static std::unique_ptr< RegularGridBuilder< 2 > > create(
             RegularGrid2D& grid );
 
diff --git a/include/geode/mesh/builder/solid_edges_builder.hpp b/include/geode/mesh/builder/solid_edges_builder.hpp
@@ -43,6 +43,8 @@ namespace geode
     public:
         explicit SolidEdgesBuilder( SolidEdges< dimension >& edges );
 
+        SolidEdgesBuilder( SolidEdgesBuilder&& ) noexcept = default;
+
         /*!
          * Delete all the isolated edges (not used as polyhedron edges)
          * @return the mapping between old edge indices to new ones.
diff --git a/include/geode/mesh/builder/solid_facets_builder.hpp b/include/geode/mesh/builder/solid_facets_builder.hpp
@@ -43,6 +43,8 @@ namespace geode
     public:
         explicit SolidFacetsBuilder( SolidFacets< dimension >& facets );
 
+        SolidFacetsBuilder( SolidFacetsBuilder&& ) noexcept = default;
+
         /*!
          * Delete all the isolated facets (not used as polyhedron facets)
          * @return the mapping between old facet indices to new ones.
diff --git a/include/geode/mesh/builder/solid_mesh_builder.hpp b/include/geode/mesh/builder/solid_mesh_builder.hpp
@@ -52,6 +52,7 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        SolidMeshBuilder( SolidMeshBuilder&& ) noexcept = default;
         virtual ~SolidMeshBuilder();
         /*!
          * Create the builder associated with a SolidMesh.
diff --git a/include/geode/mesh/builder/surface_edges_builder.hpp b/include/geode/mesh/builder/surface_edges_builder.hpp
@@ -45,6 +45,8 @@ namespace geode
     public:
         explicit SurfaceEdgesBuilder( SurfaceEdges< dimension >& edges );
 
+        SurfaceEdgesBuilder( SurfaceEdgesBuilder&& ) noexcept = default;
+
         /*!
          * Delete all the isolated edges (not used as polygon edges)
          * @return the mapping between old edge indices to new ones.
diff --git a/include/geode/mesh/builder/surface_mesh_builder.hpp b/include/geode/mesh/builder/surface_mesh_builder.hpp
@@ -54,6 +54,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        SurfaceMeshBuilder( SurfaceMeshBuilder&& ) noexcept = default;
+
         virtual ~SurfaceMeshBuilder();
 
         /*!
diff --git a/include/geode/mesh/builder/tetrahedral_solid_builder.hpp b/include/geode/mesh/builder/tetrahedral_solid_builder.hpp
@@ -44,6 +44,8 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        TetrahedralSolidBuilder( TetrahedralSolidBuilder&& ) noexcept = default;
+
         [[nodiscard]] static std::unique_ptr<
             TetrahedralSolidBuilder< dimension > >
             create( TetrahedralSolid< dimension >& mesh );
diff --git a/include/geode/mesh/builder/triangulated_surface_builder.hpp b/include/geode/mesh/builder/triangulated_surface_builder.hpp
@@ -45,6 +45,9 @@ namespace geode
     public:
         static constexpr auto dim = dimension;
 
+        TriangulatedSurfaceBuilder(
+            TriangulatedSurfaceBuilder&& ) noexcept = default;
+
         /*!
          * Create the builder associated with a TriangulatedSurface.
          * @param[in] mesh The TriangulatedSurface to build/modify
diff --git a/include/geode/mesh/builder/vertex_set_builder.hpp b/include/geode/mesh/builder/vertex_set_builder.hpp
@@ -46,10 +46,12 @@ namespace geode
      */
     class opengeode_mesh_api VertexSetBuilder : public IdentifierBuilder
     {
-        OPENGEODE_DISABLE_COPY_AND_MOVE( VertexSetBuilder );
+        OPENGEODE_DISABLE_COPY( VertexSetBuilder );
         PASSKEY( VertexSet, VertexSetKey );
 
     public:
+        VertexSetBuilder( VertexSetBuilder&& ) noexcept = default;
+
         virtual ~VertexSetBuilder() = default;
 
         /*!
diff --git a/src/geode/mesh/builder/geode/geode_edged_curve_builder.cpp b/src/geode/mesh/builder/geode/geode_edged_curve_builder.cpp
@@ -45,6 +45,10 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodeEdgedCurveBuilder< dimension >::OpenGeodeEdgedCurveBuilder(
+        OpenGeodeEdgedCurveBuilder&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodeEdgedCurveBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_graph_builder.cpp b/src/geode/mesh/builder/geode/geode_graph_builder.cpp
@@ -39,6 +39,9 @@ namespace geode
     {
     }
 
+    OpenGeodeGraphBuilder::OpenGeodeGraphBuilder(
+        OpenGeodeGraphBuilder&& ) noexcept = default;
+
     void OpenGeodeGraphBuilder::do_create_vertex()
     {
         // Operation is directly handled by the AttributeManager
diff --git a/src/geode/mesh/builder/geode/geode_hybrid_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_hybrid_solid_builder.cpp
@@ -45,6 +45,10 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodeHybridSolidBuilder< dimension >::OpenGeodeHybridSolidBuilder(
+        OpenGeodeHybridSolidBuilder&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodeHybridSolidBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_point_set_builder.cpp b/src/geode/mesh/builder/geode/geode_point_set_builder.cpp
@@ -45,6 +45,10 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodePointSetBuilder< dimension >::OpenGeodePointSetBuilder(
+        OpenGeodePointSetBuilder< dimension >&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodePointSetBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_polygonal_surface_builder.cpp b/src/geode/mesh/builder/geode/geode_polygonal_surface_builder.cpp
@@ -49,6 +49,11 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodePolygonalSurfaceBuilder< dimension >::
+        OpenGeodePolygonalSurfaceBuilder(
+            OpenGeodePolygonalSurfaceBuilder&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodePolygonalSurfaceBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_polyhedral_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_polyhedral_solid_builder.cpp
@@ -49,6 +49,11 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodePolyhedralSolidBuilder< dimension >::
+        OpenGeodePolyhedralSolidBuilder(
+            OpenGeodePolyhedralSolidBuilder&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodePolyhedralSolidBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_regular_grid_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_regular_grid_solid_builder.cpp
@@ -43,6 +43,9 @@ namespace geode
     {
     }
 
+    OpenGeodeRegularGridBuilder< 3 >::OpenGeodeRegularGridBuilder(
+        OpenGeodeRegularGridBuilder&& ) noexcept = default;
+
     void OpenGeodeRegularGridBuilder< 3 >::update_origin(
         const Point3D& origin )
     {
diff --git a/src/geode/mesh/builder/geode/geode_regular_grid_surface_builder.cpp b/src/geode/mesh/builder/geode/geode_regular_grid_surface_builder.cpp
@@ -43,6 +43,9 @@ namespace geode
     {
     }
 
+    OpenGeodeRegularGridBuilder< 2 >::OpenGeodeRegularGridBuilder(
+        OpenGeodeRegularGridBuilder&& ) noexcept = default;
+
     void OpenGeodeRegularGridBuilder< 2 >::update_origin(
         const Point2D& origin )
     {
diff --git a/src/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.cpp
@@ -49,6 +49,11 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodeTetrahedralSolidBuilder< dimension >::
+        OpenGeodeTetrahedralSolidBuilder(
+            OpenGeodeTetrahedralSolidBuilder&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodeTetrahedralSolidBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_triangulated_surface_builder.cpp b/src/geode/mesh/builder/geode/geode_triangulated_surface_builder.cpp
@@ -49,6 +49,11 @@ namespace geode
     {
     }
 
+    template < index_t dimension >
+    OpenGeodeTriangulatedSurfaceBuilder< dimension >::
+        OpenGeodeTriangulatedSurfaceBuilder(
+            OpenGeodeTriangulatedSurfaceBuilder&& ) noexcept = default;
+
     template < index_t dimension >
     void OpenGeodeTriangulatedSurfaceBuilder< dimension >::do_create_vertex()
     {
diff --git a/src/geode/mesh/builder/geode/geode_vertex_set_builder.cpp b/src/geode/mesh/builder/geode/geode_vertex_set_builder.cpp
@@ -41,6 +41,9 @@ namespace geode
     {
     }
 
+    OpenGeodeVertexSetBuilder::OpenGeodeVertexSetBuilder(
+        OpenGeodeVertexSetBuilder&& ) noexcept = default;
+
     void OpenGeodeVertexSetBuilder::do_create_vertex()
     {
         // Operation is directly handled by the AttributeManager
