Merge branch 'main' into shape-api

Author: tomvanmele

CHANGELOG.md

@@ -15,12 +15,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `compas.geometry.Geometry` base class.
 * Added `__add__`, `__sub__`, `__and__` to `compas.geometry.Shape` for boolean operations using binary operators.
 * Added `is_closed` to `compas.geometry.Polyhedron`.
+* Added `Plane.offset`.
+* Added `draw_node_labels` and `draw_edgelabels` to `compas_blender.artists.NetworkArtist`.
+* Added `compas_blender.artists.RobotModelArtist.clear`.
 
 ### Changed
 
 * Fixed bug in `compas_blender.draw_texts`.
 * Changed default resolution for shape discretisation to 16 for both u and v where relevant.
 * Changed base class of `compas.geometry.Primitive` and `compas.geometry.Shape` to `compas.geometry.Geometry`.
+* `compas_blender.artists.RobotModelArtist.collection` can be assigned as a Blender collection or a name.
+* Generalized the parameter `color` of `compas_blender.draw_texts` and various label drawing methods.
 
 ### Removed
 

src/compas_blender/artists/frameartist.py

@@ -1,3 +1,9 @@
+import bpy
+from typing import List
+from typing import Optional
+
+from compas.geometry import Frame
+
 import compas_blender
 from compas_blender.artists import BaseArtist
 
@@ -55,7 +61,10 @@ class FrameArtist(BaseArtist):
             artist.draw()
 
     """
-    def __init__(self, frame, collection=None, scale=1.0):
+    def __init__(self,
+                 frame: Frame,
+                 collection: Optional[bpy.types.Collection] = None,
+                 scale: float = 1.0):
         super(FrameArtist, self).__init__()
         self.collection = collection
         self.frame = frame
@@ -65,7 +74,7 @@ def __init__(self, frame, collection=None, scale=1.0):
         self.color_yaxis = (0, 255, 0)
         self.color_zaxis = (0, 0, 255)
 
-    def draw(self):
+    def draw(self) -> None:
         """Draw the frame.
 
         Returns
@@ -76,7 +85,7 @@ def draw(self):
         self.draw_origin()
         self.draw_axes()
 
-    def draw_origin(self):
+    def draw_origin(self) -> List[bpy.types.Object]:
         """Draw the origin of the frame.
 
         Returns
@@ -93,7 +102,7 @@ def draw_origin(self):
         self.objects += objects
         return objects
 
-    def draw_axes(self):
+    def draw_axes(self) -> List[bpy.types.Object]:
         """Draw the axes of the frame.
 
         Returns