fixed bugs in curve and surface conversions

Author: tomvanmele

CHANGELOG.md

@@ -9,10 +9,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added pluggable `compas.geometry.surfaces.nurbs.new_nurbssurface_from_native`.
+* Added `compas.geometry.NurbsSurface.from_native`.
+* Added plugin `compas_rhino.geometry.surfaces.new_nurbssurface_from_plane`.
+
 ### Changed
 
+* Fixed bug in `compas_blender.clear`.
+* Fixed bug in `compas_rhino.conversions.surface_to_compas`.
+* Fixed bug in `compas_rhino.conversions.surface_to_compas_mesh`.
+* Fixed bug in `compas_rhino.conversions.surface_to_compas_quadmesh`.
+* Fixed bug in plugin `compas_rhino.geometry.curves.new_nurbscurve_from_native`.
+* Fixed bug in plugin `compas_rhino.geometry.surfaces.new_nurbssurface_from_native`.
+
 ### Removed
 
+* Removed plugin `compas_rhino.geometry.surfaces.new_surface_from_plane`.
+
 
 ## [2.0.0] 2024-01-31
 

src/compas/geometry/surfaces/nurbs.py

@@ -16,6 +16,11 @@ def new_nurbssurface(cls, *args, **kwargs):
     raise PluginNotInstalledError
 
 
+@pluggable(category="factories")
+def new_nurbssurface_from_native(cls, *args, **kwargs):
+    raise PluginNotInstalledError
+
+
 @pluggable(category="factories")
 def new_nurbssurface_from_parameters(cls, *args, **kwargs):
     raise PluginNotInstalledError
@@ -186,6 +191,23 @@ def degree_v(self):
     # Constructors
     # ==============================================================================
 
+    @classmethod
+    def from_native(cls, surface):
+        """Construct a NURBS surface from a surface object.
+
+        Parameters
+        ----------
+        surface : :class:`Rhino.Geometry.NurbsSurface`
+            A CAD native surface object.
+
+        Returns
+        -------
+        :class:`compas.geometry.NurbsSurface`
+            A COMPAS NURBS surface.
+
+        """
+        return new_nurbssurface_from_native(cls, surface)
+
     @classmethod
     def from_parameters(
         cls,

src/compas_blender/__init__.py

@@ -5,10 +5,10 @@
 
 try:
     import bpy
+    import compas_blender.data
+
 except ImportError:
     pass
-else:
-    from .utilities import *  # noqa: F401 F403
 
 
 __version__ = "2.0.0"
@@ -51,7 +51,7 @@ def clear(guids=None):
         bpy.ops.object.select_all(action="SELECT")
         bpy.ops.object.delete(use_global=True, confirm=False)
         # delete data
-        delete_unused_data()  # noqa: F405
+        compas_blender.data.delete_unused_data()
         # delete collections
         for collection in bpy.context.scene.collection.children:
             bpy.context.scene.collection.children.unlink(collection)

src/compas_rhino/conversions/surfaces.py

@@ -7,6 +7,7 @@
 from compas.tolerance import TOL
 
 from compas.geometry import Point
+from compas.geometry import NurbsSurface
 from compas.datastructures import Mesh
 from compas.utilities import memoize
 
@@ -155,21 +156,27 @@ def surface_to_compas(surface):
     :class:`compas.geometry.Surface`
 
     """
-    brep = Rhino.Geometry.Brep.TryConvertBrep(surface)
+    if isinstance(surface, Rhino.DocObjects.RhinoObject):
+        surface = surface.Geometry
+
+    if not isinstance(surface, Rhino.Geometry.Brep):
+        brep = Rhino.Geometry.Brep.TryConvertBrep(surface)
+    else:
+        brep = surface
 
     if brep.Surfaces.Count > 1:  # type: ignore
-        raise ConversionError("Conversion of a BRep with multiple underlying surface is currently not supported.")
+        raise ConversionError("Conversion of a Brep with multiple underlying surface is currently not supported.")
 
-    return Rhino.Geometry.NurbsSurface.from_rhino(brep.Surfaces[0])
+    return NurbsSurface.from_native(brep.Surfaces[0])
 
 
-def surface_to_compas_mesh(surface, cls=None, facefilter=None, cleanup=False):
+def surface_to_compas_mesh(surface, facefilter=None, cleanup=False, cls=None):
     """Convert the surface b-rep loops to a COMPAS mesh.
 
     Parameters
     ----------
-    cls : :class:`compas.datastructures.Mesh`, optional
-        The type of COMPAS mesh.
+    surface : :class:`Rhino.Geometry.Surface`
+        A Rhino surface.
     facefilter : callable, optional
         A filter for selection which Brep faces to include.
         If provided, the filter should return True or False per face.
@@ -179,6 +186,8 @@ def surface_to_compas_mesh(surface, cls=None, facefilter=None, cleanup=False):
         Flag indicating to clean up the result.
         Cleaning up means to remove isolated faces and unused vertices.
         Default is False.
+    cls : :class:`compas.datastructures.Mesh`, optional
+        The type of COMPAS mesh.
 
     Returns
     -------
@@ -208,10 +217,16 @@ def surface_to_compas_mesh(surface, cls=None, facefilter=None, cleanup=False):
     >>> scene.draw()
 
     """
+    if isinstance(surface, Rhino.DocObjects.RhinoObject):
+        surface = surface.Geometry
+
     if not surface.HasBrepForm:
         return
 
-    brep = Rhino.Geometry.Brep.TryConvertBrep(surface)
+    if not isinstance(surface, Rhino.Geometry.Brep):
+        brep = Rhino.Geometry.Brep.TryConvertBrep(surface)
+    else:
+        brep = surface
 
     if facefilter and callable(facefilter):
         brepfaces = [face for face in brep.Faces if facefilter(face)]
@@ -224,16 +239,16 @@ def surface_to_compas_mesh(surface, cls=None, facefilter=None, cleanup=False):
     for face in brepfaces:
         loop = face.OuterLoop
         curve = loop.To3dCurve()
-        segments = curve.Explode()
-        a = segments[0].PointAtStart
-        b = segments[0].PointAtEnd
+        segments = list(curve.Explode())
+        a = point_to_compas(segments[0].PointAtStart)
+        b = point_to_compas(segments[0].PointAtEnd)
         a_gkey = TOL.geometric_key(a)
         b_gkey = TOL.geometric_key(b)
         gkey_xyz[a_gkey] = a
         gkey_xyz[b_gkey] = b
         face = [a_gkey, b_gkey]
         for segment in segments[1:-1]:
-            b = segment.PointAtEnd
+            b = point_to_compas(segment.PointAtEnd)
             b_gkey = TOL.geometric_key(b)
             face.append(b_gkey)
             gkey_xyz[b_gkey] = b
@@ -274,6 +289,8 @@ def surface_to_compas_quadmesh(surface, nu, nv=None, weld=False, facefilter=None
 
     Parameters
     ----------
+    surface: :class:`Rhino.Geometry.Surface`
+        A Rhino surface.
     nu: int
         The number of faces in the u direction.
     nv: int, optional
@@ -298,10 +315,16 @@ def surface_to_compas_quadmesh(surface, nu, nv=None, weld=False, facefilter=None
     nv = nv or nu
     cls = cls or Mesh
 
+    if isinstance(surface, Rhino.DocObjects.RhinoObject):
+        surface = surface.Geometry
+
     if not surface.HasBrepForm:
         return
 
-    brep = Rhino.Geometry.Brep.TryConvertBrep(surface)
+    if not isinstance(surface, Rhino.Geometry.Brep):
+        brep = Rhino.Geometry.Brep.TryConvertBrep(surface)
+    else:
+        brep = surface
 
     if facefilter and callable(facefilter):
         faces = [face for face in brep.Faces if facefilter(face)]

src/compas_rhino/geometry/curves/__init__.py

@@ -20,7 +20,7 @@ def new_nurbscurve(cls, *args, **kwargs):
 
 @plugin(category="factories", requires=["Rhino"])
 def new_nurbscurve_from_native(cls, *args, **kwargs):
-    return RhinoCurve.from_rhino(*args, **kwargs)
+    return RhinoNurbsCurve.from_rhino(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["Rhino"])

src/compas_rhino/geometry/surfaces/__init__.py

@@ -8,24 +8,33 @@
 
 @plugin(category="factories", requires=["Rhino"])
 def new_surface(cls, *args, **kwargs):
-    return super(Surface, cls).__new__(cls)
+    surface = super(Surface, cls).__new__(cls)
+    surface.__init__(*args, **kwargs)
+    return surface
 
 
 @plugin(category="factories", requires=["Rhino"])
-def new_surface_from_plane(cls, *args, **kwargs):
-    return RhinoSurface.from_plane(*args, **kwargs)
+def new_nurbssurface(cls, *args, **kwargs):
+    surface = super(NurbsSurface, cls).__new__(cls)
+    surface.__init__(*args, **kwargs)
+    return surface
 
 
 @plugin(category="factories", requires=["Rhino"])
-def new_nurbssurface(cls, *args, **kwargs):
-    return super(NurbsSurface, cls).__new__(cls)
+def new_nurbssurface_from_native(cls, *args, **kwargs):
+    return RhinoNurbsSurface.from_rhino(*args, **kwargs)
 
 
 @plugin(category="factories", requires=["Rhino"])
 def new_nurbssurface_from_parameters(cls, *args, **kwargs):
     return RhinoNurbsSurface.from_parameters(*args, **kwargs)
 
 
+@plugin(category="factories", requires=["Rhino"])
+def new_nurbssurface_from_plane(cls, *args, **kwargs):
+    return RhinoNurbsSurface.from_plane(*args, **kwargs)
+
+
 @plugin(category="factories", requires=["Rhino"])
 def new_nurbssurface_from_points(cls, *args, **kwargs):
     return RhinoNurbsSurface.from_points(*args, **kwargs)