capsule and box as disjoint mesh

Author: tomvanmele

src/compas_rhino/artists/boxartist.py

@@ -36,10 +36,11 @@ def draw(self, color=None):
         """
         color = color or self.color
         vertices = [list(vertex) for vertex in self.shape.vertices]
-        polygons = [{'points': [vertices[index] for index in face]} for face in self.shape.faces]
-        guids = compas_rhino.draw_faces(polygons, clear=False, redraw=False)
-        guid = compas_rhino.rs.JoinMeshes(guids, delete_input=True)
-        compas_rhino.rs.ObjectLayer(guid, self.layer)
-        compas_rhino.rs.ObjectName(guid, self.shape.name)
-        compas_rhino.rs.ObjectColor(guid, color)
+        faces = self.shape.faces
+        guid = compas_rhino.draw_mesh(vertices,
+                                      faces,
+                                      layer=self.layer,
+                                      name=self.shape.name,
+                                      color=color,
+                                      disjoint=True)
         return [guid]

src/compas_rhino/artists/capsuleartist.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import
 from __future__ import division
 
-from compas.utilities import pairwise
 import compas_rhino
 from compas.artists import ShapeArtist
 from .artist import RhinoArtist
@@ -22,54 +21,34 @@ class CapsuleArtist(RhinoArtist, ShapeArtist):
     def __init__(self, capsule, layer=None, **kwargs):
         super(CapsuleArtist, self).__init__(shape=capsule, layer=layer, **kwargs)
 
-    def draw(self, u=None, v=None, show_vertices=False, show_edges=False, show_faces=True, join_faces=True):
+    def draw(self, color=None, u=None, v=None):
         """Draw the capsule associated with the artist.
 
         Parameters
         ----------
+        color : tuple of float, optional
+            The RGB color of the capsule.
         u : int, optional
             Number of faces in the "u" direction.
             Default is ``~CapsuleArtist.u``.
         v : int, optional
             Number of faces in the "v" direction.
             Default is ``~CapsuleArtist.v``.
-        show_vertices : bool, optional
-            Default is ``False``.
-        show_edges : bool, optional
-            Default is ``False``.
-        show_faces : bool, optional
-            Default is ``True``.
-        join_faces : bool, optional
-            Default is ``True``.
 
         Returns
         -------
         list
             The GUIDs of the objects created in Rhino.
         """
+        color = color or self.color
         u = u or self.u
         v = v or self.v
         vertices, faces = self.shape.to_vertices_and_faces(u=u, v=v)
         vertices = [list(vertex) for vertex in vertices]
-        guids = []
-        if show_vertices:
-            points = [{'pos': point, 'color': self.color} for point in vertices]
-            guids += compas_rhino.draw_points(points, layer=self.layer, clear=False, redraw=False)
-        if show_edges:
-            lines = []
-            seen = set()
-            for face in faces:
-                for u, v in pairwise(face + face[:1]):
-                    if (u, v) not in seen:
-                        seen.add((u, v))
-                        seen.add((v, u))
-                        lines.append({'start': vertices[u], 'end': vertices[v], 'color': self.color})
-            guids += compas_rhino.draw_lines(lines, layer=self.layer, clear=False, redraw=False)
-        if show_faces:
-            if join_faces:
-                guid = compas_rhino.draw_mesh(vertices, faces, layer=self.layer, name=self.shape.name, color=self.color, disjoint=True)
-                guids.append(guid)
-            else:
-                polygons = [{'points': [vertices[index] for index in face], 'color': self.color} for face in faces]
-                guids += compas_rhino.draw_faces(polygons, layer=self.layer, clear=False, redraw=False)
-        return guids
+        guid = compas_rhino.draw_mesh(vertices,
+                                      faces,
+                                      layer=self.layer,
+                                      name=self.shape.name,
+                                      color=color,
+                                      disjoint=True)
+        return [guid]