Multiple additions to the func API

Author: adam-urbanczyk

cadquery/occ_impl/shapes.py

@@ -321,6 +321,9 @@
 
 from OCP.OSD import OSD_ThreadPool
 
+from OCP.Bnd import Bnd_OBB
+from OCP.BRepBndLib import BRepBndLib
+
 from math import pi, sqrt, inf, radians, cos
 
 import warnings
@@ -1432,12 +1435,12 @@ def split(self, *splitters: "Shape") -> "Shape":
 
         return self._bool_op((self,), splitters, split_op)
 
-    def distance(self, other: "Shape") -> float:
+    def distance(self, other: "Shape", tol: float = 1e-6) -> float:
         """
         Minimal distance between two shapes
         """
 
-        dist_calc = BRepExtrema_DistShapeShape(self.wrapped, other.wrapped)
+        dist_calc = BRepExtrema_DistShapeShape(self.wrapped, other.wrapped, tol)
         dist_calc.SetMultiThread(True)
 
         return dist_calc.Value()
@@ -2396,6 +2399,13 @@ def hasPCurve(self, f: "Face") -> bool:
 
         return ShapeAnalysis_Edge().HasPCurve(self.wrapped, f.wrapped)
 
+    def reversed(self) -> "Edge":
+        """
+        Return a reversed version of self.
+        """
+
+        return self.__class__(self.wrapped.Reversed())
+
     @classmethod
     def makeCircle(
         cls,
@@ -5466,6 +5476,10 @@ def shell(
     return shell(*s, tol=tol, manifold=manifold, ctx=ctx, history=history)
 
 
+# add an alias
+sew = shell
+
+
 @multimethod
 def solid(
     s1: Shape, *sn: Shape, tol: float = 1e-6, history: Optional[ShapeHistory] = None,
@@ -5842,7 +5856,7 @@ def text(
         font_i, NCollection_Utf8String(txt), theHAlign=theHAlign, theVAlign=theVAlign
     )
 
-    return clean(compound(_compound_or_shape(rv).faces()).fuse())
+    return clean(compound(_compound_or_shape(rv).Faces()).fuse())
 
 
 @text.register
@@ -5865,7 +5879,7 @@ def text(
     L = spine.Length()
 
     rv = []
-    for el in text(txt, size, font, path, kind, halign, valign):
+    for el in text(txt, size, font, path, kind, halign, valign).Faces():
         pos = el.BoundingBox().center.x
 
         # position
@@ -5899,7 +5913,7 @@ def text(
     tmp = text(txt, size, spine, False, font, path, kind, halign, valign)
 
     rv = []
-    for f in tmp.faces():
+    for f in tmp.Faces():
         rv.append(f.project(base, f.normalAt()))
 
     return _normalize(compound(rv))
@@ -6170,7 +6184,7 @@ def chamfer(s: Shape, e: Shape, d: float) -> Shape:
     return _compound_or_shape(builder.Shape())
 
 
-def extrude(s: Shape, d: VectorLike) -> Shape:
+def extrude(s: Shape, d: VectorLike, both: bool = False) -> Shape:
     """
     Extrude a shape.
     """
@@ -6179,7 +6193,11 @@ def extrude(s: Shape, d: VectorLike) -> Shape:
 
     for el in _get(s, ("Vertex", "Edge", "Wire", "Face")):
 
-        builder = BRepPrimAPI_MakePrism(el.wrapped, Vector(d).wrapped)
+        if both:
+            builder = BRepPrimAPI_MakePrism(el.moved(-d).wrapped, 2 * Vector(d).wrapped)
+        else:
+            builder = BRepPrimAPI_MakePrism(el.wrapped, Vector(d).wrapped)
+
         builder.Build()
 
         results.append(builder.Shape())
@@ -6257,6 +6275,30 @@ def _offset(t):
     return rv
 
 
+def offset2D(
+    s: Shape, t: float, kind: Literal["arc", "intersection", "tangent"] = "arc"
+) -> Shape:
+    """
+    2D Offset edges, wires or faces.
+    """
+
+    kind_dict = {
+        "arc": GeomAbs_JoinType.GeomAbs_Arc,
+        "intersection": GeomAbs_JoinType.GeomAbs_Intersection,
+        "tangent": GeomAbs_JoinType.GeomAbs_Tangent,
+    }
+
+    bldr = BRepOffsetAPI_MakeOffset()
+    bldr.Init(kind_dict[kind])
+
+    for el in _get_wires(s):
+        bldr.AddWire(el.wrapped)
+
+    bldr.Perform(t)
+
+    return _compound_or_shape(bldr.Shape())
+
+
 @multimethod
 def sweep(
     s: Shape, path: Shape, aux: Optional[Shape] = None, cap: bool = False
@@ -6500,6 +6542,7 @@ def loft(
     return loft(s, cap, ruled, continuity, parametrization, degree, compat)
 
 
+@multimethod
 def project(
     s: Shape,
     base: Shape,
@@ -6523,6 +6566,26 @@ def project(
     return _compound_or_shape(bldr.Projection())
 
 
+@project.register
+def project(
+    s: Shape, base: Shape, direction: VectorLike,
+):
+    """
+    Project s onto base using cylindrical projection.
+    """
+
+    results = []
+
+    for el in _get_wires(s):
+        bldr = BRepProj_Projection(el.wrapped, base.wrapped, Vector(direction).toDir())
+
+        while bldr.More():
+            results.append(_compound_or_shape(bldr.Current()))
+            bldr.Next()
+
+    return _normalize(compound(results))
+
+
 #%% diagnotics
 
 
@@ -6575,7 +6638,7 @@ def isSubshape(s1: Shape, s2: Shape) -> bool:
 #%% properties
 
 
-def closest(s1: Shape, s2: Shape) -> Tuple[Vector, Vector]:
+def closest(s1: Shape, s2: Shape, tol: float = 1e-6) -> Tuple[Vector, Vector]:
     """
     Closest points between two shapes.
     """
@@ -6587,7 +6650,36 @@ def closest(s1: Shape, s2: Shape) -> Tuple[Vector, Vector]:
     ext.LoadS1(s1.wrapped)
     ext.LoadS2(s2.wrapped)
 
+    ext.SetDeflection(tol)
+    import OCP
+
+    ext.SetAlgo(OCP.Extrema.Extrema_ExtAlgo.Extrema_ExtAlgo_Grad)
+
     # perform
-    assert ext.Perform()
+    ext.Perform()
 
     return Vector(ext.PointOnShape1(1)), Vector(ext.PointOnShape2(1))
+
+
+def obb(s: Shape) -> Shape:
+
+    # construct the OBB
+    bbox = Bnd_OBB()
+    BRepBndLib.AddOBB_s(
+        s.wrapped, bbox, theIsTriangulationUsed=False, theIsOptimal=True
+    )
+
+    # convert to a shape
+    center = Vector(bbox.Center())
+    xdir = Vector(bbox.XDirection())
+    ydir = Vector(bbox.YDirection())
+    zdir = Vector(bbox.ZDirection())
+
+    dx = bbox.XHSize()
+    dy = bbox.YHSize()
+    dz = bbox.ZHSize()
+
+    ax = gp_Ax2(center.toPnt(), zdir.toDir(), xdir.toDir())
+    ax.SetLocation((center - dx * xdir - dy * ydir - dz * zdir).toPnt())
+
+    return Shape.cast(BRepPrimAPI_MakeBox(ax, 2.0 * dx, 2.0 * dy, 2.0 * dz).Shape())