overwrite all options in draw call

Author: tomvanmele

src/compas/artists/shapeartist.py

@@ -38,13 +38,15 @@ class ShapeArtist(Artist):
     default_color = (1, 1, 1)
 
     def __init__(self, shape, color=None, **kwargs):
-        super(ShapeArtist, self).__init__(**kwargs)
+        super(ShapeArtist, self).__init__()
         self._u = None
         self._v = None
         self._shape = None
         self._color = None
         self.shape = shape
         self.color = color
+        self.u = kwargs.get('u')
+        self.v = kwargs.get('v')
 
     @property
     def shape(self):
@@ -73,7 +75,7 @@ def u(self):
 
     @u.setter
     def u(self, u):
-        if u > 3:
+        if u and u > 3:
             self._u = u
 
     @property
@@ -84,5 +86,5 @@ def v(self):
 
     @v.setter
     def v(self, v):
-        if v > 3:
+        if v and v > 3:
             self._v = v

src/compas_blender/artists/boxartist.py

@@ -27,14 +27,20 @@ def __init__(self,
 
         super().__init__(shape=box, collection=collection or box.name, **kwargs)
 
-    def draw(self):
+    def draw(self, color=None):
         """Draw the box associated with the artist.
 
+        Parameters
+        ----------
+        color : tuple of float, optional
+            The RGB color of the box.
+
         Returns
         -------
         list
             The objects created in Blender.
         """
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces()
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]

src/compas_blender/artists/capsuleartist.py

@@ -28,11 +28,13 @@ def __init__(self,
 
         super().__init__(shape=capsule, collection=collection or capsule.name, **kwargs)
 
-    def draw(self, u=None, v=None):
+    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``.
@@ -47,6 +49,7 @@ def draw(self, u=None, v=None):
         """
         u = u or self.u
         v = v or self.v
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces(u=u, v=v)
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]

src/compas_blender/artists/coneartist.py

@@ -28,11 +28,13 @@ def __init__(self,
 
         super().__init__(shape=cone, collection=collection or cone.name, **kwargs)
 
-    def draw(self, u=None):
+    def draw(self, color=None, u=None):
         """Draw the cone associated with the artist.
 
         Parameters
         ----------
+        color : tuple of float, optional
+            The RGB color of the cone.
         u : int, optional
             Number of faces in the "u" direction.
             Default is ``~ConeArtist.u``.
@@ -43,6 +45,7 @@ def draw(self, u=None):
             The objects created in Blender.
         """
         u = u or self.u
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces(u=u)
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]

src/compas_blender/artists/cylinderartist.py

@@ -28,11 +28,13 @@ def __init__(self,
 
         super().__init__(shape=cylinder, collection=collection or cylinder.name, **kwargs)
 
-    def draw(self, u=None):
+    def draw(self, color=None, u=None):
         """Draw the cylinder associated with the artist.
 
         Parameters
         ----------
+        color : tuple of float, optional
+            The RGB color of the cylinder.
         u : int, optional
             Number of faces in the "u" direction.
             Default is ``~CylinderArtist.u``.
@@ -43,6 +45,7 @@ def draw(self, u=None):
             The objects created in Blender.
         """
         u = u or self.u
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces(u=u)
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]

src/compas_blender/artists/polyhedronartist.py

@@ -27,14 +27,20 @@ def __init__(self,
 
         super().__init__(shape=polyhedron, collection=collection or polyhedron.name, **kwargs)
 
-    def draw(self):
+    def draw(self, color=None):
         """Draw the polyhedron associated with the artist.
 
+        Parameters
+        ----------
+        color : tuple of float, optional
+            The RGB color of the polyhedron.
+
         Returns
         -------
         list
             The objects created in Blender.
         """
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces()
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]

src/compas_blender/artists/sphereartist.py

@@ -28,11 +28,13 @@ def __init__(self,
 
         super().__init__(shape=sphere, collection=collection or sphere.name, **kwargs)
 
-    def draw(self, u=None, v=None):
+    def draw(self, color=None, u=None, v=None):
         """Draw the sphere associated with the artist.
 
         Parameters
         ----------
+        color : tuple of float, optional
+            The RGB color of the sphere.
         u : int, optional
             Number of faces in the "u" direction.
             Default is ``~SphereArtist.u``.
@@ -47,6 +49,7 @@ def draw(self, u=None, v=None):
         """
         u = u or self.u
         v = v or self.v
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces(u=u, v=v)
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]

src/compas_blender/artists/torusartist.py

@@ -28,11 +28,13 @@ def __init__(self,
 
         super().__init__(shape=torus, collection=collection or torus.name, **kwargs)
 
-    def draw(self, u=None, v=None):
+    def draw(self, color=None, u=None, v=None):
         """Draw the torus associated with the artist.
 
         Parameters
         ----------
+        color : tuple of float, optional
+            The RGB color of the torus.
         u : int, optional
             Number of faces in the "u" direction.
             Default is ``~TorusArtist.u``.
@@ -47,6 +49,7 @@ def draw(self, u=None, v=None):
         """
         u = u or self.u
         v = v or self.v
+        color = color or self.color
         vertices, faces = self.shape.to_vertices_and_faces(u=u, v=v)
-        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=self.color, collection=self.collection)
+        obj = compas_blender.draw_mesh(vertices, faces, name=self.shape.name, color=color, collection=self.collection)
         return [obj]