revert removal

elalish · Oct 8, 2024 · aabec2b · aabec2b
1 parent 34fd08d
commit aabec2b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,10 +13,7 @@
       "args": [
         "--gtest_break_on_failure",
         "--gtest_catch_exceptions=0",
-<<<<<<< HEAD
         "--gtest_filter=Boolean.Cubes"
-=======
->>>>>>> 658d3e037a0a198b605fd99e496e84b1dd674a32
       ],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/build/test",
@@ -29,4 +26,4 @@
       "externalConsole": false
     }
   ]
-}
+}
diff --git a/src/edge_op.cpp b/src/edge_op.cpp
@@ -487,6 +487,11 @@ void Manifold::Impl::CollapseEdge(const int edge, std::vector<int>& edges) {
       const vec3 pNext = vertPos_[halfedge_[current].endVert];
       const mat3x2 projection =
           GetAxisAlignedProjection(faceNormal_[current / 3]);
+      // Don't collapse if the edges separating the faces are not colinear
+      // (can happen when the two faces are coplanar).
+      if (CCW(projection * pOld, projection * pLast, projection * pNew,
+              precision_) != 0)
+        return;
       if (CCW(projection * pNext, projection * pLast, projection * pNew,
               precision_) < 0)
         return;

diff --git a/test/boolean_test.cpp b/test/boolean_test.cpp
@@ -345,6 +345,10 @@ TEST(Boolean, Split) {
   EXPECT_FLOAT_EQ(splits.first.GetProperties().volume +
                       splits.second.GetProperties().volume,
                   cube.GetProperties().volume);
+#ifdef MANIFOLD_EXPORT
+  if (options.exportModels)
+    ExportMesh("split.glb", splits.second.GetMeshGL(), {});
+#endif
 }
 
 TEST(Boolean, SplitByPlane) {