Skip to content

Commit

Permalink
Fix Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
zalo committed Jan 27, 2025
1 parent 5d18521 commit 7f7801a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/manifold.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
6 changes: 0 additions & 6 deletions test/boolean_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();
Expand All @@ -415,7 +410,6 @@ TEST(Boolean, NonConvexNonConvexMinkowski) {
ExportMesh("minkowski-nonconvex-nonconvex.glb", sum.GetMeshGL(), {});
#endif

//ManifoldParams().deterministic = oldDeterministic;
ManifoldParams().processOverlaps = false;
}

Expand Down

0 comments on commit 7f7801a

Please sign in to comment.