Merge branch 'main' into mesh-strip-split

Author: tomvanmele

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* Fixed bug in combination of `compas_rhino.artists.MeshArtist.draw_mesh` and `compas_rhino.utilities.drawing.draw_mesh`.
 * Fixed bug in continuous loops in `compas.datastructures.Halfedge.edge_loop`.
 * Fixed bug in continuous strips in `compas.datastructures.Halfedge.edge_strip`.
 * Changed abstract method `compas.artists.MeshArtist.draw_mesh` to implemented method in `compas_plotters.artists.MeshArtist.draw_mesh`.
@@ -32,6 +33,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added pluggables for `compas.geometry.NurbsSurface.__new__`, `compas.geometry.NurbsSurface.from_parameters`, `compas.geometry.NurbsSurface.from_points`, `compas.geometry.NurbsSurface.from_fill`, `compas.geometry.NurbsSurface.from_step`.
 * Added missing implementations for abstract clear methods of `compas_rhino.artists.volmeshartist`.
 
+* Added `compas_rhino.geometry.RhinoBox`, `compas_rhino.geometry.RhinoCircle`, `compas_rhino.geometry.RhinoCone`, `compas_rhino.geometry.RhinoCurve`, `compas_rhino.geometry.RhinoCylinder`, `compas_rhino.geometry.RhinoEllipse`, `compas_rhino.geometry.RhinoLine`, `compas_rhino.geometry.RhinoMesh`, `compas_rhino.geometry.RhinoPlane`, `compas_rhino.geometry.RhinoPoint`, `compas_rhino.geometry.RhinoPolyline`, `compas_rhino.geometry.RhinoSphere`, `compas_rhino.geometry.RhinoSurface`, `compas_rhino.geometry.RhinoVector` as wrappers for working with Rhino geometry through geometry conversions or coercion of doc objects.
+* Added `compas_rhino.conversions` from COMPAS geometry to Rhino geometry and vice versa, for primitives, shapes, curves, surfaces, meshes.
+* Added `compas_rhino.coercion` from Rhino doc objects to Rhino geometry compatible with COMPAS geometry.
+
 ### Changed
 
 * Fixed bug in directions of `compas.datastructures.Mesh.from_meshgrid`.
@@ -143,6 +148,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added general plotter for geometry objects and data structures based on the artist registration mechanism.
 * Added support for multimesh files to OBJ reader/writer.
 * Added support for attaching and detaching meshes in `compas.robots.RobotModelArtist` and drawing them.
+* Added `compas.geometry.NurbsCurve`.
+* Added `compas.geometry.NurbsSurface`.
+* Added `compas_rhino.conversions`.
+* Added `compas_rhino.geometry.RhinoBox`.
+* Added `compas_rhino.geometry.RhinoCone`.
+* Added `compas_rhino.geometry.RhinoCylinder`.
+* Added `compas_rhino.geometry.RhinoPolyline`.
+* Added `compas_rhino.geometry.RhinoSphere`.
 * Added `meshes` method to artists of `compas.robots.RobotModel`.
 * Added `FrameArtist` class to `compas_blender`.
 

docs/api/compas_rhino.conversions.rst

@@ -0,0 +1,2 @@
+
+.. automodule:: compas_rhino.conversions

docs/conf.py

@@ -14,8 +14,6 @@
 import sphinx_compas_theme
 from sphinx.ext.napoleon.docstring import NumpyDocstring
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../src'))
-
 # patches
 
 current_m2r2_setup = m2r2.setup
@@ -331,7 +329,9 @@ def linkcode_resolve(domain, info):
 
 # extlinks
 
-extlinks = {}
+extlinks = {
+    "rhino": ("https://developer.rhino3d.com/api/RhinoCommon/html/T_%s.htm", "%s")
+}
 
 # -- Options for HTML output ----------------------------------------------
 

docs/tutorial/curves-and-surfs.rst

@@ -0,0 +1,3 @@
+***********************
+Curves and Surfaces
+***********************

src/compas_rhino/__init__.py

@@ -10,6 +10,7 @@
 
     compas_rhino.artists
     compas_rhino.conduits
+    compas_rhino.conversions
     compas_rhino.forms
     compas_rhino.geometry
     compas_rhino.objects

src/compas_rhino/artists/meshartist.py

@@ -5,10 +5,8 @@
 from functools import partial
 
 from compas.utilities import color_to_colordict
-from compas.utilities import pairwise
 from compas.geometry import add_vectors
 from compas.geometry import scale_vector
-from compas.geometry import centroid_polygon
 from compas.geometry import centroid_points
 
 import compas_rhino
@@ -174,21 +172,9 @@ def draw_mesh(self, color=None, disjoint=False):
         vertex_xyz = self.vertex_xyz
         vertices = [vertex_xyz[vertex] for vertex in self.mesh.vertices()]
         faces = [[vertex_index[vertex] for vertex in self.mesh.face_vertices(face)] for face in self.mesh.faces()]
-        new_faces = []
-        for face in faces:
-            f = len(face)
-            if f == 3:
-                new_faces.append(face + face[-1:])
-            elif f == 4:
-                new_faces.append(face)
-            elif f > 4:
-                centroid = len(vertices)
-                vertices.append(centroid_polygon([vertices[index] for index in face]))
-                for a, b in pairwise(face + face[0:1]):
-                    new_faces.append([centroid, a, b, b])
         layer = self.layer
         name = "{}.mesh".format(self.mesh.name)
-        guid = compas_rhino.draw_mesh(vertices, new_faces, layer=layer, name=name, color=color, disjoint=disjoint)
+        guid = compas_rhino.draw_mesh(vertices, faces, layer=layer, name=name, color=color, disjoint=disjoint)
         return [guid]
 
     def draw_vertices(self, vertices=None, color=None):

src/compas_rhino/conversions/__init__.py

@@ -0,0 +1,182 @@
+"""
+********************************************************************************
+conversions
+********************************************************************************
+
+.. currentmodule:: compas_rhino.conversions
+
+.. rst-class:: lead
+
+Conversions between Rhino geometry objects (:mod:`Rhino.Geometry`) and COMPAS geometry objects (:mod:`compas.geometry`).
+
+Exceptions
+==========
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    ConversionError
+
+
+Primitives
+==========
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    point_to_rhino
+    vector_to_rhino
+    line_to_rhino
+    plane_to_rhino
+    frame_to_rhino
+    circle_to_rhino
+    ellipse_to_rhino
+    polyline_to_rhino
+    polygon_to_rhino
+    point_to_compas
+    vector_to_compas
+    line_to_compas
+    plane_to_compas
+    plane_to_compas_frame
+    circle_to_compas
+    ellipse_to_compas
+    polyline_to_compas
+    polygon_to_compas
+
+
+Shapes
+======
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    box_to_rhino
+    sphere_to_rhino
+    cone_to_rhino
+    cylinder_to_rhino
+    box_to_compas
+    sphere_to_compas
+    cone_to_compas
+    cylinder_to_compas
+
+
+Curves
+======
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+    line_to_rhino_curve
+    circle_to_rhino_curve
+    ellipse_to_rhino_curve
+    curve_to_compas_line
+    curve_to_compas_circle
+    curve_to_compas_ellipse
+    curve_to_compas_polyline
+
+
+Surfaces
+========
+
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
+
+
+"""
+from __future__ import absolute_import
+
+from .exceptions import ConversionError
+
+from .primitives import (
+    point_to_rhino,
+    vector_to_rhino,
+    line_to_rhino,
+    plane_to_rhino,
+    frame_to_rhino,
+    circle_to_rhino,
+    ellipse_to_rhino,
+    polyline_to_rhino,
+    polygon_to_rhino,
+
+    point_to_compas,
+    vector_to_compas,
+    line_to_compas,
+    plane_to_compas,
+    plane_to_compas_frame,
+    circle_to_compas,
+    ellipse_to_compas,
+    polyline_to_compas,
+    polygon_to_compas
+)
+from .shapes import (
+    box_to_rhino,
+    sphere_to_rhino,
+    cone_to_rhino,
+    cylinder_to_rhino,
+
+    box_to_compas,
+    sphere_to_compas,
+    cone_to_compas,
+    cylinder_to_compas,
+)
+from .curves import (
+    line_to_rhino_curve,
+    circle_to_rhino_curve,
+    ellipse_to_rhino_curve,
+
+    curve_to_compas_circle,
+    curve_to_compas_ellipse,
+    curve_to_compas_line,
+    curve_to_compas_polyline
+)
+
+# geometry to geometry conversions
+# Rhino object to geometry conversions
+
+__all__ = [
+    'ConversionError',
+
+    'point_to_rhino',
+    'vector_to_rhino',
+    'line_to_rhino',
+    'plane_to_rhino',
+    'frame_to_rhino',
+    'circle_to_rhino',
+    'ellipse_to_rhino',
+    'polyline_to_rhino',
+    'polygon_to_rhino',
+
+    'point_to_compas',
+    'vector_to_compas',
+    'line_to_compas',
+    'plane_to_compas',
+    'plane_to_compas_frame',
+    'circle_to_compas',
+    'ellipse_to_compas',
+    'polyline_to_compas',
+    'polygon_to_compas',
+
+    'box_to_rhino',
+    'sphere_to_rhino',
+    'cone_to_rhino',
+    'cylinder_to_rhino',
+
+    'box_to_compas',
+    'sphere_to_compas',
+    'cone_to_compas',
+    'cylinder_to_compas',
+
+    'line_to_rhino_curve',
+    'circle_to_rhino_curve',
+    'ellipse_to_rhino_curve',
+
+    'curve_to_compas_circle',
+    'curve_to_compas_ellipse',
+    'curve_to_compas_line',
+    'curve_to_compas_polyline',
+]