Skip to content

Commit 0bcd504

Browse files
committed
Merge branch 'refs/heads/adlayers3'
# Conflicts: # adlayers3 # unittests/test_adlayers3.py
2 parents bcd578c + 38cc1a9 commit 0bcd504

7 files changed

Lines changed: 37780 additions & 510 deletions

File tree

adlayers3

sfmesh/geom_utils.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -861,15 +861,9 @@ def check_triangle_vs_existing(
861861
if segment_segment_distance_3d(a1, a2, b1, b2) < tolerance:
862862
return True
863863

864-
# 新三角形的非共享边 vs 现有三角形内部
865-
for a1, a2 in edges_new:
866-
if _edge_intersects_triangle_core(a1, a2, q0, q1, q2):
867-
return True
868-
869-
# 现有三角形的非共享边 vs 新三角形内部
870-
for b1, b2 in edges_ex:
871-
if _edge_intersects_triangle_core(b1, b2, p0, p1, p2):
872-
return True
864+
# 注意:在曲面上,共享一个顶点的三角形的非共享边可能在3D空间
865+
# 穿过对方三角形的"内部"(因为曲面弯曲),这是合法的。
866+
# 因此跳过 edge_intersects_triangle_core 检查。
873867

874868
return False
875869

sfmesh/mesh_3d_afm.py

Lines changed: 2612 additions & 394 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)