Merge branch 'next' of github.com:Geode-solutions/OpenGeode into feat…

…/cut_along_solid_facets
Geode-solutions · May 17, 2024 · 0749021 · 0749021
2 parents 944de9e + ad9e07e
commit 0749021
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/cmake/CppTargets.cmake b/cmake/CppTargets.cmake
@@ -58,11 +58,12 @@ function(add_geode_library)
         )
     endforeach()
     set(PROJECT_LIB_NAME ${PROJECT_NAME}::${GEODE_LIB_NAME})
-    set(VERSION_RC_FILE ${PROJECT_BINARY_DIR}/${GEODE_LIB_FOLDER}/version.rc)
-    if(EXISTS ${VERSION_RC_FILE})
+    set(VERSION_RC_FILE_IN ${PROJECT_SOURCE_DIR}/cmake/version.rc.in)
+    if(EXISTS ${VERSION_RC_FILE_IN})
         message(STATUS "Configuring version.rc")
+        set(VERSION_RC_FILE ${PROJECT_BINARY_DIR}/${GEODE_LIB_FOLDER}/version.rc)
         configure_file(
-            ${PROJECT_SOURCE_DIR}/cmake/version.rc.in
+            ${VERSION_RC_FILE_IN}
             ${VERSION_RC_FILE}
             @ONLY
         )

diff --git a/src/geode/mesh/core/solid_mesh.cpp b/src/geode/mesh/core/solid_mesh.cpp
@@ -191,17 +191,21 @@ namespace
         const geode::SolidMesh< dimension >& solid,
         const std::array< geode::index_t, 2 >& vertices )
     {
-        for( const auto& polyhedron :
-            solid.polyhedra_around_vertex( vertices[0] ) )
+        for( const auto vertex : vertices )
         {
-            for( const auto& edge_vertices :
-                solid.polyhedron_edges_vertices( polyhedron.polyhedron_id ) )
+            for( const auto& polyhedron :
+                solid.polyhedra_around_vertex( vertex ) )
             {
-                if( vertices == edge_vertices
-                    || ( vertices[0] == edge_vertices[1]
-                         && vertices[1] == edge_vertices[0] ) )
+                for( const auto& edge_vertices :
+                    solid.polyhedron_edges_vertices(
+                        polyhedron.polyhedron_id ) )
                 {
-                    return polyhedron.polyhedron_id;
+                    if( vertices == edge_vertices
+                        || ( vertices[0] == edge_vertices[1]
+                             && vertices[1] == edge_vertices[0] ) )
+                    {
+                        return polyhedron.polyhedron_id;
+                    }
                 }
             }
         }

diff --git a/src/geode/mesh/helpers/detail/cut_along_solid_facets.cpp b/src/geode/mesh/helpers/detail/cut_along_solid_facets.cpp
@@ -23,10 +23,6 @@
 
 #include <geode/mesh/helpers/detail/cut_along_solid_facets.h>
 
-// #include <async++.h>
-
-// #include <absl/memory/memory.h>
-
 #include <geode/basic/attribute_manager.h>
 #include <geode/basic/pimpl_impl.h>
 
@@ -93,7 +89,7 @@ namespace geode
                 absl::Span< const PolyhedronFacet > facets_list )
             {
                 SolidInfo info{ solid_.nb_vertices() };
-                for( const auto solid_facet : facets_list )
+                for( const auto& solid_facet : facets_list )
                 {
                     if( const auto adj =
                             solid_.polyhedron_adjacent_facet( solid_facet ) )
@@ -112,7 +108,7 @@ namespace geode
                     for( const auto local_vertex_id : LRange{
                              solid_.nb_polyhedron_vertices( polyhedron_id ) } )
                     {
-                        PolyhedronVertex vertex{ polyhedron_id,
+                        const PolyhedronVertex vertex{ polyhedron_id,
                             local_vertex_id };
                         const auto vertex_id =
                             solid_.polyhedron_vertex( vertex );
@@ -233,7 +229,7 @@ namespace geode
                             .value(),
                         facet_id );
                 }
-                auto old2new = facets_builder.delete_isolated_facets();
+                const auto old2new = facets_builder.delete_isolated_facets();
                 return final_facets_mapping( facets_mapping, old2new );
             }
 
@@ -287,7 +283,7 @@ namespace geode
                         solid_edges.edge_from_vertices( edge_vertices ).value(),
                         edge_id );
                 }
-                auto old2new = edges_builder.delete_isolated_edges();
+                const auto old2new = edges_builder.delete_isolated_edges();
                 return final_edges_mapping( edges_mapping, old2new );
             }