updated_version

Author: panquez

src/geode/mesh/helpers/convert_surface_mesh.cpp

@@ -271,6 +271,39 @@ namespace
             *surface, *builder, grid, cells_to_densify );
         return surface;
     }
+
+    template < geode::index_t dimension >
+    void transfer_adjacents(
+        geode::TriangulatedSurfaceBuilder< dimension >& builder,
+        absl::Span< const std::optional< geode::PolygonEdge > > adjacents,
+        absl::Span< const geode::index_t > new_polygons )
+    {
+        if( adjacents.front() )
+        {
+            builder.set_polygon_adjacent(
+                { new_polygons.front(), 0 }, adjacents.front()->polygon_id );
+            builder.set_polygon_adjacent(
+                adjacents.front().value(), new_polygons.front() );
+        }
+        for( const auto v : LRange{ 1, nb_vertices - 1 } )
+        {
+            if( adjacents[v] )
+            {
+                builder.set_polygon_adjacent(
+                    { new_polygons[v - 1], 1 }, adjacents[v]->polygon_id );
+                builder.set_polygon_adjacent(
+                    adjacents[v].value(), new_polygons[v - 1] );
+            }
+        }
+        if( adjacents.back() )
+        {
+            builder.set_polygon_adjacent(
+                { new_polygons.back(), 2 }, adjacents.back()->polygon_id );
+            builder.set_polygon_adjacent(
+                adjacents.back().value(), new_polygons.back() );
+        }
+        builder.compute_polygon_adjacencies( new_polygons );
+    }
 } // namespace
 
 namespace geode
@@ -352,8 +385,6 @@ namespace geode
             to_delete[p] = nb_vertices != 3;
             if( nb_vertices > 3 )
             {
-                DEBUG( "====== " );
-                DEBUG( p );
                 absl::FixedArray< std::optional< PolygonEdge > > adjacents(
                     nb_vertices, std::nullopt );
                 for( const auto e : LRange{ nb_vertices } )
@@ -367,34 +398,8 @@ namespace geode
                 {
                     new_polygons.emplace_back( builder.create_polygon(
                         { vertices[0], vertices[v - 1], vertices[v] } ) );
-                    DEBUG( new_polygons.back() );
-                }
-                if( adjacents.front() )
-                {
-                    builder.set_polygon_adjacent( { new_polygons.front(), 0 },
-                        adjacents.front()->polygon_id );
-                    builder.set_polygon_adjacent(
-                        adjacents.front().value(), new_polygons.front() );
-                }
-                for( const auto v : LRange{ 1, nb_vertices - 1 } )
-                {
-                    if( adjacents[v] )
-                    {
-                        builder.set_polygon_adjacent(
-                            { new_polygons[v - 1], 1 },
-                            adjacents[v]->polygon_id );
-                        builder.set_polygon_adjacent(
-                            adjacents[v].value(), new_polygons[v - 1] );
-                    }
-                }
-                if( adjacents.back() )
-                {
-                    builder.set_polygon_adjacent( { new_polygons.back(), 2 },
-                        adjacents.back()->polygon_id );
-                    builder.set_polygon_adjacent(
-                        adjacents.back().value(), new_polygons.back() );
                 }
-                builder.compute_polygon_adjacencies( new_polygons );
+                ::transfer_adjacents( builder, adjacents, new_polygons );
             }
         }
         to_delete.resize( surface.nb_polygons(), false );