Merge branch 'feat_add_ellipsoid_radius_neighbors_in_nnsearch' of https://github.com/Geode-solutions/OpenGeode into feat_add_ellipsoid_radius_neighbors_in_nnsearch

benoit2776 · benoit2776 · commit 5c6afdbd781a · 2025-03-12T14:24:52.000+01:00
diff --git a/src/geode/mesh/helpers/detail/curve_merger.cpp b/src/geode/mesh/helpers/detail/curve_merger.cpp
@@ -230,8 +230,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
@@ -218,8 +218,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 );
         }

Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,8 @@ namespace geode`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`template < index_t dimension >`
`233`		`- auto EdgedCurveMerger< dimension >::edge_origins( index_t edge ) const`
`234`		`- -> const EdgeOrigins&`
	`233`	`+ auto EdgedCurveMerger< dimension >::edge_origins(`
	`234`	`+ index_t edge ) const -> const EdgeOrigins&`
`235`	`235`	`{`
`236`	`236`	`return impl_->edge_origins( edge );`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ namespace geode`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`template < typename Mesh >`
`221`		`- auto VertexMerger< Mesh >::vertex_origins( index_t vertex ) const`
`222`		`- -> const VertexOrigins&`
	`221`	`+ auto VertexMerger< Mesh >::vertex_origins(`
	`222`	`+ index_t vertex ) const -> const VertexOrigins&`
`223`	`223`	`{`
`224`	`224`	`return impl_->vertex_origins( vertex );`
`225`	`225`	`}`