match rhino/blender artist's behavior

Author: gonzalocasas

src/compas_ghpython/artists/meshartist.py

@@ -23,25 +23,63 @@ class MeshArtist(GHArtist, MeshArtist):
         A COMPAS mesh.
     """
 
-    def __init__(self, mesh, **kwargs):
+    def __init__(self,
+                 mesh,
+                 show_mesh=False,
+                 show_vertices=True,
+                 show_edges=True,
+                 show_faces=True,
+                 **kwargs):
         super(MeshArtist, self).__init__(mesh=mesh, **kwargs)
+        self.show_mesh = show_mesh
+        self.show_vertices = show_vertices
+        self.show_edges = show_edges
+        self.show_faces = show_faces
 
-    def draw(self, color=None):
-        """Draw the mesh as a RhinoMesh.
+    def draw(self, vertices=None, edges=None, faces=None, vertexcolor=None, edgecolor=None, facecolor=None, color=None, join_faces=False):
+        """Draw the mesh using the chosen visualisation settings.
 
         Parameters
         ----------
+        vertices : list, optional
+            A list of vertices to draw.
+            Default is ``None``, in which case all vertices are drawn.
+        edges : list, optional
+            A list of edges to draw.
+            The default is ``None``, in which case all edges are drawn.
+        faces : list, optional
+            A selection of faces to draw.
+            The default is ``None``, in which case all faces are drawn.
+        vertexcolor : tuple or dict of tuple, optional
+            The color specififcation for the vertices.
+            The default color is the value of ``~MeshArtist.default_vertexcolor``.
+        edgecolor : tuple or dict of tuple, optional
+            The color specififcation for the edges.
+            The default color is the value of ``~MeshArtist.default_edgecolor``.
+        facecolor : tuple or dict of tuple, optional
+            The color specififcation for the faces.
+            The default color is the value of ``~MeshArtist.default_facecolor``.
         color : tuple, optional
             The color of the mesh.
             Default is the value of ``~MeshArtist.default_color``.
+        join_faces : bool, optional
+            Join the faces into 1 mesh.
+            Default is ``False``, in which case the faces are drawn as individual meshes.
 
         Returns
         -------
         :class:`Rhino.Geometry.Mesh`
         """
-        color = color or self.default_color
-        vertices, faces = self.mesh.to_vertices_and_faces()
-        return compas_ghpython.draw_mesh(vertices, faces, color)
+        geometry = []
+        if self.show_mesh:
+            geometry.append(self.draw_mesh(color=color))
+        if self.show_vertices:
+            geometry.extend(self.draw_vertices(vertices=vertices, color=vertexcolor))
+        if self.show_edges:
+            geometry.extend(self.draw_edges(edges=edges, color=edgecolor))
+        if self.show_faces:
+            geometry.extend(self.draw_faces(faces=faces, color=facecolor, join_faces=join_faces))
+        return geometry
 
     def draw_mesh(self, color=None):
         """Draw the mesh as a RhinoMesh.
@@ -63,7 +101,10 @@ def draw_mesh(self, color=None):
         The mesh should be a valid Rhino Mesh object, which means it should have only triangular or quadrilateral faces.
         Faces with more than 4 vertices will be triangulated on-the-fly.
         """
-        return self.draw(color)
+        color = color or self.default_color
+        print(self.default_color)
+        vertices, faces = self.mesh.to_vertices_and_faces()
+        return compas_ghpython.draw_mesh(vertices, faces, color)
 
     def draw_vertices(self, vertices=None, color=None):
         """Draw a selection of vertices.

src/compas_rhino/artists/meshartist.py

@@ -106,7 +106,7 @@ def clear_facelabels(self):
     # ==========================================================================
 
     def draw(self, vertices=None, edges=None, faces=None, vertexcolor=None, edgecolor=None, facecolor=None, join_faces=False):
-        """Draw the network using the chosen visualisation settings.
+        """Draw the mesh using the chosen visualisation settings.
 
         Parameters
         ----------