Merge pull request #914 from Geode-solutions/fix/complete-explicit-tests

fix(Mesh Mergers): add missing operator== on ElementOrigin structures
Geode-solutions · Apr 11, 2024 · 3361d99 · 3361d99
2 parents 3704e70 + 55b60f5
commit 3361d99
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/include/geode/mesh/helpers/detail/curve_merger.h b/include/geode/mesh/helpers/detail/curve_merger.h
@@ -51,6 +51,11 @@ namespace geode
                 {
                 }
 
+                bool operator==( const EdgeOrigin& other ) const
+                {
+                    return curve == other.curve && edge == other.edge;
+                }
+
                 index_t curve;
                 index_t edge;
             };

diff --git a/include/geode/mesh/helpers/detail/solid_merger.h b/include/geode/mesh/helpers/detail/solid_merger.h
@@ -51,6 +51,12 @@ namespace geode
                 {
                 }
 
+                bool operator==( const PolyhedronOrigin& other ) const
+                {
+                    return solid == other.solid
+                           && polyhedron == other.polyhedron;
+                }
+
                 index_t solid;
                 index_t polyhedron;
             };

diff --git a/src/geode/mesh/helpers/detail/vertex_merger.cpp b/src/geode/mesh/helpers/detail/vertex_merger.cpp
@@ -42,6 +42,10 @@ namespace
     std::unique_ptr< Mesh > create_mesh(
         absl::Span< const std::reference_wrapper< const Mesh > > meshes )
     {
+        if( meshes.empty() )
+        {
+            return Mesh::create();
+        }
         const auto type = meshes.front().get().type_name();
         for( const auto& mesh : meshes )
         {