From 7f7801a1ac53b6224023796762c2c2458c5df98d Mon Sep 17 00:00:00 2001 From: Johnathon Selstad Date: Mon, 27 Jan 2025 13:12:05 -0800 Subject: [PATCH] Fix Formatting --- src/manifold.cpp | 4 ++-- test/boolean_test.cpp | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/manifold.cpp b/src/manifold.cpp index fd5c8329a..a4e707743 100644 --- a/src/manifold.cpp +++ b/src/manifold.cpp @@ -1026,9 +1026,9 @@ Manifold Manifold::Minkowski(const Manifold& other, bool inset) const { for (size_t bFace = 0; bFace < bImpl->NumTri(); bFace++) { const bool coplanar = linalg::all(linalg::equal(aImpl->faceNormal_[aFace], - bImpl->faceNormal_[bFace])) || + bImpl->faceNormal_[bFace])) || linalg::all(linalg::equal(aImpl->faceNormal_[aFace], - -bImpl->faceNormal_[bFace])); + -bImpl->faceNormal_[bFace])); if (coplanar) continue; // Skip Coplanar Triangles vec3 a1 = aImpl->vertPos_[aImpl->halfedge_[(aFace * 3) + 0].startVert]; diff --git a/test/boolean_test.cpp b/test/boolean_test.cpp index 9c04fe131..a931984a6 100644 --- a/test/boolean_test.cpp +++ b/test/boolean_test.cpp @@ -365,8 +365,6 @@ TEST(Boolean, ConvexConvexMinkowski) { } TEST(Boolean, NonConvexConvexMinkowski) { - //bool oldDeterministic = ManifoldParams().deterministic; - //ManifoldParams().deterministic = true; ManifoldParams().processOverlaps = true; Manifold sphere = Manifold::Sphere(1.2, 20); @@ -387,13 +385,10 @@ TEST(Boolean, NonConvexConvexMinkowski) { ExportMesh("minkowski-nonconvex-convex.glb", sum.GetMeshGL(), {}); #endif - //ManifoldParams().deterministic = oldDeterministic; ManifoldParams().processOverlaps = false; } TEST(Boolean, NonConvexNonConvexMinkowski) { - //bool oldDeterministic = ManifoldParams().deterministic; - //ManifoldParams().deterministic = true; ManifoldParams().processOverlaps = true; Manifold tet = Manifold::Tetrahedron(); @@ -415,7 +410,6 @@ TEST(Boolean, NonConvexNonConvexMinkowski) { ExportMesh("minkowski-nonconvex-nonconvex.glb", sum.GetMeshGL(), {}); #endif - //ManifoldParams().deterministic = oldDeterministic; ManifoldParams().processOverlaps = false; }