Rename Layer to Collection

- linting
- added comment

Author: robin-gdwl

src/compas_blender/artists/robotmodelartist.py

@@ -20,16 +20,16 @@ class RobotModelArtist(BaseRobotModelArtist):
         The name of the layer that will contain the robot meshes.
     """
 
-    def __init__(self, model, layer=None):
-        self.layer = layer
+    def __init__(self, model, collection=None, layer=None):
+        self.view_layer = layer
+        self.collection = collection
         super(RobotModelArtist, self).__init__(model)
 
     def transform(self, native_mesh, transformation):
         native_mesh.matrix_world @= mathutils.Matrix(transformation.matrix)
 
     def draw_geometry(self, geometry, name=None, color=None):
         # Imported colors take priority over a the parameter color
-        # TODO: cleanup confusion between layers and collections
 
         if 'mesh_color.diffuse' in geometry.attributes:
             color = geometry.attributes['mesh_color.diffuse']
@@ -41,23 +41,16 @@ def draw_geometry(self, geometry, name=None, color=None):
         else:
             color = [1., 1., 1.]
 
-        if self.layer:
-            
-            current_collections = bpy.data.collections.items()
-            #print(bpy.data.collections)
-            #print(bpy.data.collections.keys())
-
-            if self.layer not in bpy.data.collections.keys():
-                collection = bpy.data.collections.new(self.layer)  # create new collection if none exists
-                bpy.context.scene.collection.children.link(collection)  # link the new collection to the base collection
-            else: 
-                collection = bpy.data.collections.get(self.layer)
-               # print(collection)
-            
+        if self.collection:
+            if self.collection not in bpy.data.collections.keys():
+                target_collection = bpy.data.collections.new(self.collection)  # create new collection if none exists
+                bpy.context.scene.collection.children.link(target_collection)  # link the new collection to the base collection
+            else:  # not necessary: linking the object to an existing collection is done in compas_blender.draw_mesh
+                target_collection = bpy.data.collections.get(self.collection)
 
         v, f = geometry.to_vertices_and_faces()
-        # Draw the mesh in blender in the specified collection
-        return compas_blender.draw_mesh(vertices=v, faces=f, name=name, color=color, centroid=False, collection=self.layer)
+        # Draw the mesh in Blender in the specified collection
+        return compas_blender.draw_mesh(vertices=v, faces=f, name=name, color=color, centroid=False, collection=self.collection)
 
     def redraw(self, timeout=None):
         bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)

src/compas_blender/utilities/drawing.py

@@ -46,11 +46,11 @@ def _link_objects(objects, collection=None, layer=None):
     # if not layer:
     #     layer = bpy.context.view_layer
     # layer_collection = layer.active_layer_collection.collection
-    
+
     for o in objects:
         for c in o.users_collection:
             c.objects.unlink(o)
-        collection.objects.link(o)  # TODO: why does this not work
+        collection.objects.link(o)
         # layer_collection.objects.link(o)