Merge branch 'main' into fix-halfedge-before-on-boundary

Author: tomvanmele

CHANGELOG.md

@@ -20,18 +20,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `format` task using `black` formatter.
 * Added a `test_intersection_circle_circle_xy` in the `test_intersections`
 * Added split operation to `compas_rhino.geometry.Brep`.
+* Added a `RhinoArtist` in `compas_rhino`.
+* Added a `RhinoArtist` in `compas_ghpython`.
 
 ### Changed
 
 * Based all gltf data classes on `BaseGLTFDataClass`
 * Fixed `Color.__get___` AttributeError.
 * Fixed `cylinder_to_rhino` conversion to match `compas.geometry.Cylinder` location.
+* Changed identification of cylinder brep face to non-zero in `compas_rhino.conversions.cylinder.Cylinder`.
 * Changed linter to `black`.
 * Automatically trigger `invoke format` during `invoke release`.
 * Fixed bug in `intersections.intersection_circle_circle_xy` where the Circle's Plane was accessed instead of the centre. 
 * Fixed bug in `_core.tangent` where the Circle's Plane was accessed instead of the centre.
 * Fixed the `test_tangent` to work with a properly defined circle
-
+* `RhinoBrep` serialization works now with surface types other than NURBS.
 ### Removed
 
 

src/compas_ghpython/artists/__init__.py

@@ -35,6 +35,7 @@
     SurfaceArtist
     TorusArtist
     VectorArtist
+    BrepArtist
 
 
 Datastructure Artists
@@ -91,6 +92,7 @@
 from compas.geometry import Surface
 from compas.geometry import Torus
 from compas.geometry import Vector
+from compas.geometry import Brep
 
 from compas.datastructures import Mesh
 from compas.datastructures import Network
@@ -119,6 +121,7 @@
 from .torusartist import TorusArtist
 from .vectorartist import VectorArtist
 from .volmeshartist import VolMeshArtist
+from .brepartist import BrepArtist
 
 
 ShapeArtist.default_color = (255, 255, 255)
@@ -160,6 +163,7 @@ def register_artists():
     Artist.register(Torus, TorusArtist, context="Grasshopper")
     Artist.register(Vector, VectorArtist, context="Grasshopper")
     Artist.register(VolMesh, VolMeshArtist, context="Grasshopper")
+    Artist.register(Brep, BrepArtist, context="Grasshopper")
     print("GH Artists registered.")
 
 

src/compas_ghpython/artists/brepartist.py

@@ -0,0 +1,28 @@
+from compas_ghpython.artists import GHArtist
+from compas_ghpython.utilities import draw_brep
+
+
+class BrepArtist(GHArtist):
+    """An artist for drawing a brep in Grasshopper.
+
+    Parameters
+    ==========
+    brep : :class:`~compas_rhino.geometry.RhinoBrep`
+        The brep to draw.
+
+    """
+
+    def __init__(self, brep):
+        super(BrepArtist, self).__init__()
+        self._brep = brep
+
+    def draw(self):
+        """Draw the brep as a Grasshopper geometry.
+
+        Returns
+        -------
+        :rhino:`Rhino.Geometry.Brep`
+            The Grasshopper geometry instance.
+
+        """
+        return draw_brep(self._brep)

src/compas_ghpython/utilities/__init__.py

@@ -23,6 +23,7 @@
     draw_spheres
     draw_mesh
     draw_network
+    draw_brep
 
 
 sets
@@ -69,6 +70,7 @@
     draw_mesh,
     draw_network,
     draw_circles,
+    draw_brep,
 )
 from .sets import list_to_ghtree, ghtree_to_list
 from .timer import update_component
@@ -87,6 +89,7 @@
     "draw_mesh",
     "draw_network",
     "draw_circles",
+    "draw_brep",
     "list_to_ghtree",
     "ghtree_to_list",
     "update_component",

src/compas_ghpython/utilities/drawing.py

@@ -463,3 +463,19 @@ def draw_circles(circles):
         radius = c["radius"]
         rg_circles.append(Circle(Plane(Point3d(*point), Vector3d(*normal)), radius))
     return rg_circles
+
+
+def draw_brep(brep):
+    """Draw a RhinoBrep in Grasshopper.
+
+    Parameters
+    ----------
+    brep : :class:`~compas.geometry.RhinoBrep`
+        The Brep to draw.
+
+    Returns
+    -------
+    :rhino:`Rhino.Geometry.Brep`
+
+    """
+    return brep.native_brep

src/compas_rhino/artists/__init__.py

@@ -21,6 +21,7 @@
     PolygonArtist
     PolylineArtist
     VectorArtist
+    BrepArtist
 
 
 Shape Artists
@@ -106,6 +107,7 @@
 
 from compas.geometry import Curve
 from compas.geometry import Surface
+from compas.geometry import Brep
 
 from compas.datastructures import Mesh
 from compas.datastructures import Network
@@ -137,6 +139,7 @@
 
 from .curveartist import CurveArtist
 from .surfaceartist import SurfaceArtist
+from .brepartist import BrepArtist
 
 BaseArtist = RhinoArtist
 
@@ -174,6 +177,7 @@ def register_artists():
     Artist.register(RobotModel, RobotModelArtist, context="Rhino")
     Artist.register(Curve, CurveArtist, context="Rhino")
     Artist.register(Surface, SurfaceArtist, context="Rhino")
+    Artist.register(Brep, BrepArtist, context="Rhino")
     print("Rhino Artists registered.")
 
 
@@ -201,4 +205,5 @@ def register_artists():
     "RobotModelArtist",
     "CurveArtist",
     "SurfaceArtist",
+    "BrepArtist",
 ]

src/compas_rhino/artists/brepartist.py

@@ -0,0 +1,28 @@
+import compas_rhino
+from .artist import RhinoArtist
+
+
+class BrepArtist(RhinoArtist):
+    """An artist for drawing a RhinoBrep.
+
+    Parameters
+    ==========
+    brep : :class:`~compas_rhino.geometry.RhinoBrep`
+        The Brep to draw.
+
+    """
+
+    def __init__(self, brep):
+        super(BrepArtist, self).__init__()
+        self._brep = brep
+
+    def draw(self, color=None):
+        """Bakes the Brep into the current document
+
+        Returns
+        -------
+        list(:rhino:`System.Guid`)
+            The guid of the baked Brep.
+
+        """
+        return [compas_rhino.draw_brep(self._brep, color)]

src/compas_rhino/conversions/cylinder.py

@@ -46,7 +46,10 @@ def geometry(self, geometry):
                 faces = geometry.Faces
                 geometry = None
                 for face in faces:
-                    if face.IsCylinder():
+                    # being too strict about what is considered a cylinder
+                    # results in cylinders created by Rhino itself
+                    # to not be recognized...
+                    if face.IsCylinder(0.001):
                         result, geometry = face.TryGetFiniteCylinder(0.001)
                         if result:
                             break

src/compas_rhino/geometry/brep/brep.py

@@ -103,7 +103,7 @@ def points(self):
     @property
     def edges(self):
         if self._brep:
-            return [RhinoBrepEdge(edge) for edge in self._brep.Edges]
+            return [RhinoBrepEdge(trim) for trim in self._brep.Trims]
 
     @property
     def loops(self):

src/compas_rhino/geometry/brep/edge.py

@@ -5,23 +5,30 @@
 from compas_rhino.geometry import RhinoNurbsCurve
 from compas_rhino.conversions import curve_to_compas_line
 from compas_rhino.conversions import curve_to_compas_circle
+from compas_rhino.conversions import curve_to_compas_ellipse
 from compas_rhino.conversions import line_to_rhino_curve
 from compas_rhino.conversions import circle_to_rhino_curve
+from compas_rhino.conversions import ellipse_to_rhino_curve
+
 
 from .vertex import RhinoBrepVertex
 
 
 class RhinoBrepEdge(BrepEdge):
-    """A wrapper for Rhino.Geometry.BrepEdge
+    """A wrapper for Rhino.Geometry.BrepEdge.
+
+    The expected native type here is a Rhino.Geometry.BrepTrim.
+    a BrepTrim holds a reference to its associated BrepEdge as well as its start a end vertices
+    in a correct topological order (!).
 
     Attributes
     ----------
     curve : :class:`Rhino.Geometry.Curve3D`
         The underlying geometry of this edge.
     start_vertex : :class:`~compas_rhino.geometry.RhinoBrepVertex`, read-only
-        The start vertex of this edge.
+        The start vertex of this edge (taken from BrepTrim).
     end_vertex : :class:`~compas_rhino.geometry.RhinoBrepVertex`, read-only
-        The end vertex of this edge.
+        The end vertex of this edge (taken from BrepTrim).
     vertices : list[:class:`~compas_rhino.geometry.RhinoBrepVertex`], read-only
         The list of vertices which comprise this edge (start and end)
     is_circle : bool, read-only
@@ -31,20 +38,20 @@ class RhinoBrepEdge(BrepEdge):
 
     """
 
-    def __init__(self, rhino_edge=None):
+    def __init__(self, rhino_trim=None):
         super(RhinoBrepEdge, self).__init__()
         self._edge = None
         self._curve = None
         self._start_vertex = None
         self._end_vertex = None
-        if rhino_edge:
-            self._set_edge(rhino_edge)
+        if rhino_trim:
+            self._set_edge(rhino_trim)
 
-    def _set_edge(self, native_edge):
-        self._edge = native_edge
+    def _set_edge(self, rhino_trim):
+        self._edge = rhino_trim.Edge
         self._curve = self._edge.EdgeCurve
-        self._start_vertex = RhinoBrepVertex(self._edge.StartVertex)
-        self._end_vertex = RhinoBrepVertex(self._edge.EndVertex)
+        self._start_vertex = RhinoBrepVertex(rhino_trim.StartVertex)
+        self._end_vertex = RhinoBrepVertex(rhino_trim.EndVertex)
 
     # ==============================================================================
     # Data
@@ -58,13 +65,16 @@ def data(self):
         elif self.is_circle:
             type_ = "circle"
             curve = curve_to_compas_circle(self._curve)
+        elif self.is_ellipse:
+            type_ = "ellipse"
+            curve = curve_to_compas_ellipse(self._curve)
         else:
             type_ = "nurbs"
             curve = RhinoNurbsCurve.from_rhino(self._curve)
         return {
             "type": type_,
             "value": curve.data,
-            "points": [self._start_vertex.point.data, self._end_vertex.point.data],
+            "points": [self.start_vertex.point.data, self.end_vertex.point.data],
         }
 
     @data.setter
@@ -78,9 +88,11 @@ def data(self, value):
             self._curve = circle_to_rhino_curve(
                 Circle.from_data(value["value"])
             )  # this returns a Nurbs Curve, why?
+        elif curve_type == "ellipse":
+            self._curve = ellipse_to_rhino_curve(value["value"])
         else:
             self._curve = RhinoNurbsCurve.from_data(value["value"]).rhino_curve
-        # TODO: can a single edge be defined with more than start and end vertices?
+
         self._start_vertex, self._end_vertex = RhinoBrepVertex(), RhinoBrepVertex()
         self._start_vertex._point = Point.from_data(value["points"][0])
         self._end_vertex._point = Point.from_data(value["points"][1])
@@ -103,7 +115,7 @@ def end_vertex(self):
 
     @property
     def vertices(self):
-        return [self._start_vertex, self._end_vertex]
+        return [self.start_vertex, self.end_vertex]
 
     @property
     def is_circle(self):
@@ -112,3 +124,7 @@ def is_circle(self):
     @property
     def is_line(self):
         return self._curve.IsLinear()
+
+    @property
+    def is_ellipse(self):
+        return self._curve.IsEllipse()