From 5d307980a82342ee26bae7ce451e22d910afec5c Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Fri, 6 Sep 2024 12:14:56 +0000 Subject: [PATCH] Apply prepare changes --- bindings/python/requirements.txt | 2 +- include/geode/basic/attribute.hpp | 10 ++++--- .../model/mixin/builder/topology_builder.hpp | 2 +- src/geode/basic/cell_array.cpp | 4 +-- src/geode/geometry/basic_objects/circle.cpp | 4 +-- .../geometry/basic_objects/infinite_line.cpp | 2 +- .../geometry/basic_objects/tetrahedron.cpp | 6 ++-- src/geode/image/core/raster_image.cpp | 4 +-- .../geode/geode_edged_curve_builder.cpp | 2 +- .../geode/geode_hybrid_solid_builder.cpp | 2 +- .../builder/geode/geode_point_set_builder.cpp | 2 +- .../geode/geode_polygonal_surface_builder.cpp | 4 +-- .../geode/geode_polyhedral_solid_builder.cpp | 4 +-- .../geode_regular_grid_solid_builder.cpp | 2 +- .../geode_regular_grid_surface_builder.cpp | 2 +- .../geode/geode_tetrahedral_solid_builder.cpp | 4 +-- .../geode_triangulated_surface_builder.cpp | 4 +-- .../geode/geode_vertex_set_builder.cpp | 2 +- src/geode/mesh/core/graph.cpp | 8 +++--- src/geode/mesh/core/grid.cpp | 12 ++++---- src/geode/mesh/core/light_regular_grid.cpp | 8 +++--- src/geode/mesh/core/solid_mesh.cpp | 8 +++--- src/geode/mesh/core/surface_mesh.cpp | 8 +++--- .../helpers/detail/component_identifier.cpp | 4 +-- .../mesh/helpers/detail/curve_merger.cpp | 4 +-- .../mesh/helpers/detail/vertex_merger.cpp | 4 +-- .../model/helpers/simplicial_brep_creator.cpp | 2 +- .../helpers/simplicial_section_creator.cpp | 2 +- src/geode/model/mixin/core/block.cpp | 2 +- src/geode/model/mixin/core/blocks.cpp | 4 +-- src/geode/model/mixin/core/corner.cpp | 4 +-- src/geode/model/mixin/core/line.cpp | 4 +-- .../model/mixin/core/line_collections.cpp | 5 ++-- src/geode/model/mixin/core/relationships.cpp | 28 +++++++++---------- src/geode/model/mixin/core/surface.cpp | 2 +- .../model/mixin/core/vertex_identifier.cpp | 10 +++---- src/geode/model/representation/core/brep.cpp | 16 +++++------ 37 files changed, 99 insertions(+), 98 deletions(-) diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt index 749b0f6c5..7da2f59c8 100644 --- a/bindings/python/requirements.txt +++ b/bindings/python/requirements.txt @@ -2,5 +2,5 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile bindings/python/requirements.in +# pip-compile --pre bindings/python/requirements.in # diff --git a/include/geode/basic/attribute.hpp b/include/geode/basic/attribute.hpp index b3fad65bb..c14e0f1b3 100644 --- a/include/geode/basic/attribute.hpp +++ b/include/geode/basic/attribute.hpp @@ -283,7 +283,8 @@ namespace geode set_value( std::move( value ) ); } - ConstantAttribute() : ReadOnlyAttribute< T >( AttributeProperties{} ){}; + ConstantAttribute() + : ReadOnlyAttribute< T >( AttributeProperties{} ) {}; template < typename Archive > void serialize( Archive& archive ) @@ -425,7 +426,8 @@ namespace geode values_.reserve( 10 ); } - VariableAttribute() : ReadOnlyAttribute< T >( AttributeProperties{} ){}; + VariableAttribute() + : ReadOnlyAttribute< T >( AttributeProperties{} ) {}; template < typename Archive > void serialize( Archive& archive ) @@ -620,7 +622,7 @@ namespace geode } VariableAttribute() - : ReadOnlyAttribute< bool >( AttributeProperties{} ){}; + : ReadOnlyAttribute< bool >( AttributeProperties{} ) {}; template < typename Archive > void serialize( Archive& archive ) @@ -819,7 +821,7 @@ namespace geode values_.reserve( 10 ); } - SparseAttribute() : ReadOnlyAttribute< T >( AttributeProperties{} ){}; + SparseAttribute() : ReadOnlyAttribute< T >( AttributeProperties{} ) {}; template < typename Archive > void serialize( Archive& archive ) diff --git a/include/geode/model/mixin/builder/topology_builder.hpp b/include/geode/model/mixin/builder/topology_builder.hpp index 8cdd835ee..ddfa76df7 100644 --- a/include/geode/model/mixin/builder/topology_builder.hpp +++ b/include/geode/model/mixin/builder/topology_builder.hpp @@ -39,6 +39,6 @@ namespace geode protected: explicit TopologyBuilder( Topology& topology ) : RelationshipsBuilder( topology ), - VertexIdentifierBuilder( topology ){}; + VertexIdentifierBuilder( topology ) {}; }; } // namespace geode diff --git a/src/geode/basic/cell_array.cpp b/src/geode/basic/cell_array.cpp index 61d2456af..e1279d0d6 100644 --- a/src/geode/basic/cell_array.cpp +++ b/src/geode/basic/cell_array.cpp @@ -134,8 +134,8 @@ namespace geode CellArray< dimension >::CellArray( CellArray&& ) noexcept = default; template < index_t dimension > - auto CellArray< dimension >::operator=( CellArray&& ) noexcept - -> CellArray& = default; + auto CellArray< dimension >::operator=( + CellArray&& ) noexcept -> CellArray& = default; template < index_t dimension > CellArray< dimension >::~CellArray() = default; diff --git a/src/geode/geometry/basic_objects/circle.cpp b/src/geode/geometry/basic_objects/circle.cpp index 04185bdb6..458b4857e 100644 --- a/src/geode/geometry/basic_objects/circle.cpp +++ b/src/geode/geometry/basic_objects/circle.cpp @@ -100,8 +100,8 @@ namespace geode } Circle::Circle( const Circle& ) = default; Circle::Circle( const OwnerCircle& other ) - : Base( - { other.plane().normal(), other.plane().origin() }, other.radius() ) + : Base( { other.plane().normal(), other.plane().origin() }, + other.radius() ) { } Circle& Circle::operator=( const Circle& ) = default; diff --git a/src/geode/geometry/basic_objects/infinite_line.cpp b/src/geode/geometry/basic_objects/infinite_line.cpp index 34f799140..8ac65eddb 100644 --- a/src/geode/geometry/basic_objects/infinite_line.cpp +++ b/src/geode/geometry/basic_objects/infinite_line.cpp @@ -78,7 +78,7 @@ namespace geode OwnerInfiniteLine< dimension >::OwnerInfiniteLine( const Segment< dimension >& segment ) : OwnerInfiniteLine( - segment.normalized_direction(), segment.vertices()[0] ) + segment.normalized_direction(), segment.vertices()[0] ) { } template < index_t dimension > diff --git a/src/geode/geometry/basic_objects/tetrahedron.cpp b/src/geode/geometry/basic_objects/tetrahedron.cpp index 200005120..dfcf16283 100644 --- a/src/geode/geometry/basic_objects/tetrahedron.cpp +++ b/src/geode/geometry/basic_objects/tetrahedron.cpp @@ -104,9 +104,9 @@ namespace geode Tetrahedron::Tetrahedron( const Tetrahedron& other ) noexcept = default; Tetrahedron::Tetrahedron( const OwnerTetrahedron& other ) noexcept : Base( other.vertices()[0], - other.vertices()[1], - other.vertices()[2], - other.vertices()[3] ) + other.vertices()[1], + other.vertices()[2], + other.vertices()[3] ) { } Tetrahedron& Tetrahedron::operator=( diff --git a/src/geode/image/core/raster_image.cpp b/src/geode/image/core/raster_image.cpp index 79fe51b56..62585d0b9 100644 --- a/src/geode/image/core/raster_image.cpp +++ b/src/geode/image/core/raster_image.cpp @@ -109,8 +109,8 @@ namespace geode } template < index_t dimension > - auto RasterImage< dimension >::cell_indices( index_t index ) const - -> CellIndices + auto RasterImage< dimension >::cell_indices( + index_t index ) const -> CellIndices { return impl_->cell_indices( *this, index ); } diff --git a/src/geode/mesh/builder/geode/geode_edged_curve_builder.cpp b/src/geode/mesh/builder/geode/geode_edged_curve_builder.cpp index 6a53b8203..13c2c348e 100644 --- a/src/geode/mesh/builder/geode/geode_edged_curve_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_edged_curve_builder.cpp @@ -34,7 +34,7 @@ namespace geode OpenGeodeEdgedCurveBuilder< dimension >::OpenGeodeEdgedCurveBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeEdgedCurveBuilder< dimension >( - dynamic_cast< OpenGeodeEdgedCurve< dimension >& >( vertex_set ) ) + dynamic_cast< OpenGeodeEdgedCurve< dimension >& >( vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_hybrid_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_hybrid_solid_builder.cpp index 800572d52..03d29bfc0 100644 --- a/src/geode/mesh/builder/geode/geode_hybrid_solid_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_hybrid_solid_builder.cpp @@ -34,7 +34,7 @@ namespace geode OpenGeodeHybridSolidBuilder< dimension >::OpenGeodeHybridSolidBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeHybridSolidBuilder< dimension >( - dynamic_cast< OpenGeodeHybridSolid< dimension >& >( vertex_set ) ) + dynamic_cast< OpenGeodeHybridSolid< dimension >& >( vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_point_set_builder.cpp b/src/geode/mesh/builder/geode/geode_point_set_builder.cpp index 10c728a4f..de2368ded 100644 --- a/src/geode/mesh/builder/geode/geode_point_set_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_point_set_builder.cpp @@ -34,7 +34,7 @@ namespace geode OpenGeodePointSetBuilder< dimension >::OpenGeodePointSetBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodePointSetBuilder< dimension >( - dynamic_cast< OpenGeodePointSet< dimension >& >( vertex_set ) ) + dynamic_cast< OpenGeodePointSet< dimension >& >( vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_polygonal_surface_builder.cpp b/src/geode/mesh/builder/geode/geode_polygonal_surface_builder.cpp index acedc631a..630f4fa30 100644 --- a/src/geode/mesh/builder/geode/geode_polygonal_surface_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_polygonal_surface_builder.cpp @@ -35,8 +35,8 @@ namespace geode dimension >::OpenGeodePolygonalSurfaceBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodePolygonalSurfaceBuilder< dimension >( - dynamic_cast< OpenGeodePolygonalSurface< dimension >& >( - vertex_set ) ) + dynamic_cast< OpenGeodePolygonalSurface< dimension >& >( + vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_polyhedral_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_polyhedral_solid_builder.cpp index 42bb6074d..006b0ea85 100644 --- a/src/geode/mesh/builder/geode/geode_polyhedral_solid_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_polyhedral_solid_builder.cpp @@ -35,8 +35,8 @@ namespace geode dimension >::OpenGeodePolyhedralSolidBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodePolyhedralSolidBuilder< dimension >( - dynamic_cast< OpenGeodePolyhedralSolid< dimension >& >( - vertex_set ) ) + dynamic_cast< OpenGeodePolyhedralSolid< dimension >& >( + vertex_set ) ) { } 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 index 31fb07601..6005621a5 100644 --- a/src/geode/mesh/builder/geode/geode_regular_grid_solid_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_regular_grid_solid_builder.cpp @@ -33,7 +33,7 @@ namespace geode OpenGeodeRegularGridBuilder< 3 >::OpenGeodeRegularGridBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeRegularGridBuilder< 3 >( - dynamic_cast< OpenGeodeRegularGrid< 3 >& >( vertex_set ) ) + dynamic_cast< OpenGeodeRegularGrid< 3 >& >( vertex_set ) ) { } 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 index c0c1ed2c1..361a27a2c 100644 --- a/src/geode/mesh/builder/geode/geode_regular_grid_surface_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_regular_grid_surface_builder.cpp @@ -33,7 +33,7 @@ namespace geode OpenGeodeRegularGridBuilder< 2 >::OpenGeodeRegularGridBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeRegularGridBuilder< 2 >( - dynamic_cast< OpenGeodeRegularGrid< 2 >& >( vertex_set ) ) + dynamic_cast< OpenGeodeRegularGrid< 2 >& >( vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.cpp b/src/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.cpp index 90d189f0a..dfcb81f3b 100644 --- a/src/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_tetrahedral_solid_builder.cpp @@ -35,8 +35,8 @@ namespace geode dimension >::OpenGeodeTetrahedralSolidBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeTetrahedralSolidBuilder< dimension >( - dynamic_cast< OpenGeodeTetrahedralSolid< dimension >& >( - vertex_set ) ) + dynamic_cast< OpenGeodeTetrahedralSolid< dimension >& >( + vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_triangulated_surface_builder.cpp b/src/geode/mesh/builder/geode/geode_triangulated_surface_builder.cpp index aa16a9e6a..73ec643c2 100644 --- a/src/geode/mesh/builder/geode/geode_triangulated_surface_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_triangulated_surface_builder.cpp @@ -35,8 +35,8 @@ namespace geode dimension >::OpenGeodeTriangulatedSurfaceBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeTriangulatedSurfaceBuilder< dimension >( - dynamic_cast< OpenGeodeTriangulatedSurface< dimension >& >( - vertex_set ) ) + dynamic_cast< OpenGeodeTriangulatedSurface< dimension >& >( + vertex_set ) ) { } diff --git a/src/geode/mesh/builder/geode/geode_vertex_set_builder.cpp b/src/geode/mesh/builder/geode/geode_vertex_set_builder.cpp index 2cfa96266..896ccf99b 100644 --- a/src/geode/mesh/builder/geode/geode_vertex_set_builder.cpp +++ b/src/geode/mesh/builder/geode/geode_vertex_set_builder.cpp @@ -31,7 +31,7 @@ namespace geode OpenGeodeVertexSetBuilder::OpenGeodeVertexSetBuilder( VertexSet& vertex_set, MeshBuilderFactoryKey ) : OpenGeodeVertexSetBuilder( - dynamic_cast< OpenGeodeVertexSet& >( vertex_set ) ) + dynamic_cast< OpenGeodeVertexSet& >( vertex_set ) ) { } diff --git a/src/geode/mesh/core/graph.cpp b/src/geode/mesh/core/graph.cpp index 472b5fe1e..492c7a05d 100644 --- a/src/geode/mesh/core/graph.cpp +++ b/src/geode/mesh/core/graph.cpp @@ -45,10 +45,10 @@ namespace geode public: explicit Impl( Graph& graph ) : edges_around_vertex_( - graph.vertex_attribute_manager() - .template find_or_create_attribute< VariableAttribute, - EdgesAroundVertex >( - ATTRIBUTE_NAME, EdgesAroundVertex{} ) ) + graph.vertex_attribute_manager() + .template find_or_create_attribute< VariableAttribute, + EdgesAroundVertex >( + ATTRIBUTE_NAME, EdgesAroundVertex{} ) ) { } diff --git a/src/geode/mesh/core/grid.cpp b/src/geode/mesh/core/grid.cpp index 076943189..44ed6cb2b 100644 --- a/src/geode/mesh/core/grid.cpp +++ b/src/geode/mesh/core/grid.cpp @@ -524,8 +524,8 @@ namespace geode } template < index_t dimension > - auto Grid< dimension >::cell_vertices( const CellIndices& cell_id ) const - -> CellVertices + auto Grid< dimension >::cell_vertices( + const CellIndices& cell_id ) const -> CellVertices { return impl_->cell_vertices( cell_id ); } @@ -572,15 +572,15 @@ namespace geode } template < index_t dimension > - auto Grid< dimension >::cells( const Point< dimension >& query ) const - -> CellsAroundVertex + auto Grid< dimension >::cells( + const Point< dimension >& query ) const -> CellsAroundVertex { return impl_->cells( *this, query ); } template < index_t dimension > - auto Grid< dimension >::cells_around( VertexIndices vertex_indices ) const - -> CellsAroundVertex + auto Grid< dimension >::cells_around( + VertexIndices vertex_indices ) const -> CellsAroundVertex { return impl_->cells_around( *this, vertex_indices ); } diff --git a/src/geode/mesh/core/light_regular_grid.cpp b/src/geode/mesh/core/light_regular_grid.cpp index 32563ee92..3f9c007fe 100644 --- a/src/geode/mesh/core/light_regular_grid.cpp +++ b/src/geode/mesh/core/light_regular_grid.cpp @@ -122,8 +122,8 @@ namespace geode } template < index_t dimension > - auto LightRegularGrid< dimension >::vertex_indices( index_t index ) const - -> VertexIndices + auto LightRegularGrid< dimension >::vertex_indices( + index_t index ) const -> VertexIndices { return impl_->vertex_indices( *this, index ); } @@ -136,8 +136,8 @@ namespace geode } template < index_t dimension > - auto LightRegularGrid< dimension >::cell_indices( index_t index ) const - -> CellIndices + auto LightRegularGrid< dimension >::cell_indices( + index_t index ) const -> CellIndices { return impl_->cell_indices( *this, index ); } diff --git a/src/geode/mesh/core/solid_mesh.cpp b/src/geode/mesh/core/solid_mesh.cpp index 2f6e98ebe..e4f4b7fdd 100644 --- a/src/geode/mesh/core/solid_mesh.cpp +++ b/src/geode/mesh/core/solid_mesh.cpp @@ -413,10 +413,10 @@ namespace geode public: explicit Impl( SolidMesh& solid ) : polyhedron_around_vertex_( - solid.vertex_attribute_manager() - .template find_or_create_attribute< VariableAttribute, - PolyhedronVertex >( - "polyhedron_around_vertex", PolyhedronVertex{} ) ), + solid.vertex_attribute_manager() + .template find_or_create_attribute< VariableAttribute, + PolyhedronVertex >( + "polyhedron_around_vertex", PolyhedronVertex{} ) ), polyhedra_around_vertex_( solid.vertex_attribute_manager() .template find_or_create_attribute< VariableAttribute, diff --git a/src/geode/mesh/core/surface_mesh.cpp b/src/geode/mesh/core/surface_mesh.cpp index d0c92cb67..dbf5c40c0 100644 --- a/src/geode/mesh/core/surface_mesh.cpp +++ b/src/geode/mesh/core/surface_mesh.cpp @@ -274,10 +274,10 @@ namespace geode public: Impl( SurfaceMesh& surface ) : polygon_around_vertex_( - surface.vertex_attribute_manager() - .template find_or_create_attribute< VariableAttribute, - PolygonVertex >( - "polygon_around_vertex", PolygonVertex{} ) ), + surface.vertex_attribute_manager() + .template find_or_create_attribute< VariableAttribute, + PolygonVertex >( + "polygon_around_vertex", PolygonVertex{} ) ), polygons_around_vertex_( surface.vertex_attribute_manager() .template find_or_create_attribute< VariableAttribute, diff --git a/src/geode/mesh/helpers/detail/component_identifier.cpp b/src/geode/mesh/helpers/detail/component_identifier.cpp index f0f1b283c..9a25bfdd2 100644 --- a/src/geode/mesh/helpers/detail/component_identifier.cpp +++ b/src/geode/mesh/helpers/detail/component_identifier.cpp @@ -194,7 +194,7 @@ namespace geode public: explicit Impl( const EdgedCurve< dimension >& curve ) : Propagator< EdgedCurve< dimension > >( - curve, curve.nb_edges() ) + curve, curve.nb_edges() ) { } @@ -256,7 +256,7 @@ namespace geode public: explicit Impl( const SurfaceMesh< dimension >& surface ) : Propagator< SurfaceMesh< dimension > >( - surface, surface.nb_polygons() ) + surface, surface.nb_polygons() ) { } diff --git a/src/geode/mesh/helpers/detail/curve_merger.cpp b/src/geode/mesh/helpers/detail/curve_merger.cpp index 2487c1059..32b1b1d6e 100644 --- a/src/geode/mesh/helpers/detail/curve_merger.cpp +++ b/src/geode/mesh/helpers/detail/curve_merger.cpp @@ -209,8 +209,8 @@ namespace geode } template < index_t dimension > - auto EdgedCurveMerger< dimension >::edge_origins( index_t edge ) const - -> const EdgeOrigins& + auto EdgedCurveMerger< dimension >::edge_origins( + index_t edge ) const -> const EdgeOrigins& { return impl_->edge_origins( edge ); } diff --git a/src/geode/mesh/helpers/detail/vertex_merger.cpp b/src/geode/mesh/helpers/detail/vertex_merger.cpp index f7fcd5e9e..809cba950 100644 --- a/src/geode/mesh/helpers/detail/vertex_merger.cpp +++ b/src/geode/mesh/helpers/detail/vertex_merger.cpp @@ -178,8 +178,8 @@ namespace geode } template < typename Mesh > - auto VertexMerger< Mesh >::vertex_origins( index_t vertex ) const - -> const VertexOrigins& + auto VertexMerger< Mesh >::vertex_origins( + index_t vertex ) const -> const VertexOrigins& { return impl_->vertex_origins( vertex ); } diff --git a/src/geode/model/helpers/simplicial_brep_creator.cpp b/src/geode/model/helpers/simplicial_brep_creator.cpp index 6142b1d83..baf4abe54 100644 --- a/src/geode/model/helpers/simplicial_brep_creator.cpp +++ b/src/geode/model/helpers/simplicial_brep_creator.cpp @@ -41,7 +41,7 @@ namespace geode public: Impl( BRep& brep, std::vector< Point3D > unique_points ) : internal::SimplicialModelCreator< BRep >( - brep, std::move( unique_points ) ) + brep, std::move( unique_points ) ) { } diff --git a/src/geode/model/helpers/simplicial_section_creator.cpp b/src/geode/model/helpers/simplicial_section_creator.cpp index 736ddfe5b..676394f50 100644 --- a/src/geode/model/helpers/simplicial_section_creator.cpp +++ b/src/geode/model/helpers/simplicial_section_creator.cpp @@ -37,7 +37,7 @@ namespace geode public: Impl( Section& section, std::vector< Point2D > unique_points ) : internal::SimplicialModelCreator< Section >( - section, std::move( unique_points ) ) + section, std::move( unique_points ) ) { } diff --git a/src/geode/model/mixin/core/block.cpp b/src/geode/model/mixin/core/block.cpp index c313a5ee2..2d34cc540 100644 --- a/src/geode/model/mixin/core/block.cpp +++ b/src/geode/model/mixin/core/block.cpp @@ -61,7 +61,7 @@ namespace geode template < index_t dimension > Block< dimension >::Block() : Block( MeshFactory::default_impl( - PolyhedralSolid< dimension >::type_name_static() ) ) + PolyhedralSolid< dimension >::type_name_static() ) ) { } diff --git a/src/geode/model/mixin/core/blocks.cpp b/src/geode/model/mixin/core/blocks.cpp index 5c1607ae3..6a1588797 100644 --- a/src/geode/model/mixin/core/blocks.cpp +++ b/src/geode/model/mixin/core/blocks.cpp @@ -61,8 +61,8 @@ namespace geode Blocks< dimension >::~Blocks() = default; template < index_t dimension > - auto Blocks< dimension >::operator=( Blocks&& ) noexcept - -> Blocks& = default; + auto Blocks< dimension >::operator=( + Blocks&& ) noexcept -> Blocks& = default; template < index_t dimension > index_t Blocks< dimension >::nb_blocks() const diff --git a/src/geode/model/mixin/core/corner.cpp b/src/geode/model/mixin/core/corner.cpp index 1310f10cf..958b3aa1f 100644 --- a/src/geode/model/mixin/core/corner.cpp +++ b/src/geode/model/mixin/core/corner.cpp @@ -119,8 +119,8 @@ namespace geode } template < index_t dimension > - auto Corner< dimension >::modifiable_mesh( CornersBuilderKey /*unused*/ ) - -> Mesh& + auto Corner< dimension >::modifiable_mesh( + CornersBuilderKey /*unused*/ ) -> Mesh& { return modifiable_mesh(); } diff --git a/src/geode/model/mixin/core/line.cpp b/src/geode/model/mixin/core/line.cpp index bd3baa685..aa887b9cf 100644 --- a/src/geode/model/mixin/core/line.cpp +++ b/src/geode/model/mixin/core/line.cpp @@ -152,8 +152,8 @@ namespace geode } template < index_t dimension > - auto Line< dimension >::modifiable_mesh( LinesBuilderKey /*unused*/ ) - -> Mesh& + auto Line< dimension >::modifiable_mesh( + LinesBuilderKey /*unused*/ ) -> Mesh& { return modifiable_mesh(); } diff --git a/src/geode/model/mixin/core/line_collections.cpp b/src/geode/model/mixin/core/line_collections.cpp index 8829552f5..f2c4b0def 100644 --- a/src/geode/model/mixin/core/line_collections.cpp +++ b/src/geode/model/mixin/core/line_collections.cpp @@ -260,9 +260,8 @@ namespace geode } template < index_t dimension > - auto - LineCollections< dimension >::ModifiableLineCollectionRange::end() const - -> const ModifiableLineCollectionRange& + auto LineCollections< dimension >::ModifiableLineCollectionRange::end() + const -> const ModifiableLineCollectionRange& { return *this; } diff --git a/src/geode/model/mixin/core/relationships.cpp b/src/geode/model/mixin/core/relationships.cpp index 866ee019e..53396d01e 100644 --- a/src/geode/model/mixin/core/relationships.cpp +++ b/src/geode/model/mixin/core/relationships.cpp @@ -476,8 +476,8 @@ namespace geode Relationships::RelationRangeIterator::RelationRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } @@ -560,8 +560,8 @@ namespace geode Relationships::BoundaryRangeIterator::BoundaryRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } @@ -644,8 +644,8 @@ namespace geode Relationships::IncidenceRangeIterator::IncidenceRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } @@ -728,8 +728,8 @@ namespace geode Relationships::InternalRangeIterator::InternalRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } @@ -812,8 +812,8 @@ namespace geode Relationships::EmbeddingRangeIterator::EmbeddingRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } @@ -896,8 +896,8 @@ namespace geode Relationships::ItemRangeIterator::ItemRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } @@ -980,8 +980,8 @@ namespace geode Relationships::CollectionRangeIterator::CollectionRangeIterator( const Relationships& relationships, const uuid& component_id ) : impl_( *relationships.impl_, - relationships.impl_->begin_edge( component_id ), - relationships.impl_->end_edge( component_id ) ) + relationships.impl_->begin_edge( component_id ), + relationships.impl_->end_edge( component_id ) ) { } diff --git a/src/geode/model/mixin/core/surface.cpp b/src/geode/model/mixin/core/surface.cpp index bcfe2636c..c505ab9f8 100644 --- a/src/geode/model/mixin/core/surface.cpp +++ b/src/geode/model/mixin/core/surface.cpp @@ -79,7 +79,7 @@ namespace geode template < index_t dimension > Surface< dimension >::Surface() : Surface( MeshFactory::default_impl( - PolygonalSurface< dimension >::type_name_static() ) ) + PolygonalSurface< dimension >::type_name_static() ) ) { } diff --git a/src/geode/model/mixin/core/vertex_identifier.cpp b/src/geode/model/mixin/core/vertex_identifier.cpp index 03204b238..d4220ff0b 100644 --- a/src/geode/model/mixin/core/vertex_identifier.cpp +++ b/src/geode/model/mixin/core/vertex_identifier.cpp @@ -72,11 +72,11 @@ namespace geode public: Impl() : component_vertices_( - unique_vertices_.vertex_attribute_manager() - .find_or_create_attribute< VariableAttribute, - std::vector< ComponentMeshVertex > >( - "component vertices", - std::vector< ComponentMeshVertex >{} ) ) + unique_vertices_.vertex_attribute_manager() + .find_or_create_attribute< VariableAttribute, + std::vector< ComponentMeshVertex > >( + "component vertices", + std::vector< ComponentMeshVertex >{} ) ) { } diff --git a/src/geode/model/representation/core/brep.cpp b/src/geode/model/representation/core/brep.cpp index b0e3f22f4..8ce770db6 100644 --- a/src/geode/model/representation/core/brep.cpp +++ b/src/geode/model/representation/core/brep.cpp @@ -137,8 +137,8 @@ namespace geode BRep::BoundarySurfaceRange::~BoundarySurfaceRange() = default; - auto BRep::BoundarySurfaceRange::begin() const - -> const BoundarySurfaceRange& + auto + BRep::BoundarySurfaceRange::begin() const -> const BoundarySurfaceRange& { return *this; } @@ -209,8 +209,8 @@ namespace geode BRep::IncidentSurfaceRange::~IncidentSurfaceRange() = default; - auto BRep::IncidentSurfaceRange::begin() const - -> const IncidentSurfaceRange& + auto + BRep::IncidentSurfaceRange::begin() const -> const IncidentSurfaceRange& { return *this; } @@ -398,8 +398,8 @@ namespace geode BRep::InternalSurfaceRange::~InternalSurfaceRange() = default; - auto BRep::InternalSurfaceRange::begin() const - -> const InternalSurfaceRange& + auto + BRep::InternalSurfaceRange::begin() const -> const InternalSurfaceRange& { return *this; } @@ -449,8 +449,8 @@ namespace geode return *this; } - auto BRep::EmbeddingSurfaceRange::end() const - -> const EmbeddingSurfaceRange& + auto + BRep::EmbeddingSurfaceRange::end() const -> const EmbeddingSurfaceRange& { return *this; }