From 5f67a1932afc03f425bd4e8231e80b4c439d2a42 Mon Sep 17 00:00:00 2001 From: Jonathan Wagenet Date: Fri, 14 Nov 2025 17:30:55 -0500 Subject: [PATCH] Update for dev merge to Compound and Face(Plane) --- src/build123d/topology/composite.py | 2 +- src/build123d/topology/three_d.py | 2 +- src/build123d/topology/two_d.py | 2 +- tests/test_direct_api/test_intersection.py | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/build123d/topology/composite.py b/src/build123d/topology/composite.py index be136b2..14c67b4 100644 --- a/src/build123d/topology/composite.py +++ b/src/build123d/topology/composite.py @@ -782,7 +782,7 @@ class Compound(Mixin3D[TopoDS_Compound]): other.position + other.direction * bbox.diagonal * dist, ) case Plane(): - target = Face.make_plane(other) + target = Face(other) case Vector(): target = Vertex(other) case Location(): diff --git a/src/build123d/topology/three_d.py b/src/build123d/topology/three_d.py index 80a8239..279f46f 100644 --- a/src/build123d/topology/three_d.py +++ b/src/build123d/topology/three_d.py @@ -491,7 +491,7 @@ class Mixin3D(Shape[TOPODS]): other.position + other.direction * bbox.diagonal * dist, ) case Plane(): - target = Face.make_plane(other) + target = Face(other) case Vector(): target = Vertex(other) case Location(): diff --git a/src/build123d/topology/two_d.py b/src/build123d/topology/two_d.py index 37f51f0..450fa10 100644 --- a/src/build123d/topology/two_d.py +++ b/src/build123d/topology/two_d.py @@ -350,7 +350,7 @@ class Mixin2D(ABC, Shape[TOPODS]): other.position + other.direction * bbox.diagonal * dist, ) case Plane(): - target = Face.make_plane(other) + target = Face(other) case Vector(): target = Vertex(other) case Location(): diff --git a/tests/test_direct_api/test_intersection.py b/tests/test_direct_api/test_intersection.py index 3a67415..758fd6f 100644 --- a/tests/test_direct_api/test_intersection.py +++ b/tests/test_direct_api/test_intersection.py @@ -355,10 +355,10 @@ def test_shape_3d(obj, target, expected): run_test(obj, target, expected) # Compound Shapes -cp1 = Compound() + GridLocations(5, 0, 2, 1) * Vertex() -cp2 = Compound() + GridLocations(5, 0, 2, 1) * Line((0, -1), (0, 1)) -cp3 = Compound() + GridLocations(5, 0, 2, 1) * Rectangle(2, 2) -cp4 = Compound() + GridLocations(5, 0, 2, 1) * Box(2, 2, 2) +cp1 = Compound(GridLocations(5, 0, 2, 1) * Vertex()) +cp2 = Compound(GridLocations(5, 0, 2, 1) * Line((0, -1), (0, 1))) +cp3 = Compound(GridLocations(5, 0, 2, 1) * Rectangle(2, 2)) +cp4 = Compound(GridLocations(5, 0, 2, 1) * Box(2, 2, 2)) cv1 = Curve() + [ed1, ed2, ed3] sk1 = Sketch() + [fc1, fc2, fc3]