Merge pull request #1303 from compas-dev/mesh-coloring-rhino

Fix handling of mesh colors in rhino

Author: tomvanmele

CHANGELOG.md

@@ -16,8 +16,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-* Changed `compas.datastructures.TreeNode` to skip serialising `attributes`, `name` and `children` if being empty. 
+* Changed `compas.datastructures.TreeNode` to skip serialising `attributes`, `name` and `children` if being empty.
 * Changed `compas.datastructures.TreeNode.__repr__` to omit `name` if `None`.
+* Changed `compas.scene.descriptors.ColorDictAttribute` to accept a `compas.colors.ColorDict` as value.
+* Changed `compas_rhino.scene.RhinoMeshObject.draw` to preprocess vertex and face color dicts into lists.
+* Changed `compas_rhino.conversions.vertices_and_faces_to_rhino` to handle vertex color information correctly.
 
 ### Removed
 

src/compas/scene/descriptors/colordict.py

@@ -91,6 +91,11 @@ def __set__(self, obj, value):
             colordict.clear()
             colordict.update(value)
 
+        elif isinstance(value, ColorDict):
+            colordict.clear()
+            colordict.default = value.default
+            colordict.update(value)
+
         else:
             colordict.clear()
             colordict.default = value

src/compas_rhino/conversions/meshes.py

@@ -204,19 +204,18 @@ def face_callback(face):
 
             face_callback(face)
 
-    # if color:
-    #     mesh.VertexColors.CreateMonotoneMesh(SystemColor.FromArgb(*color.rgb255))
-    # else:
-    if not color:
-        if vertexcolors:
-            if len(mesh.Vertices) != len(vertexcolors):
-                raise ValueError("The number of vertex colors does not match the number of vertices.")
-
-            colors = System.Array.CreateInstance(System.Drawing.Color, len(vertexcolors))
-            for index, color in enumerate(vertexcolors):
-                colors[index] = System.Drawing.Color.FromArgb(*color.rgb255)
-
-            mesh.VertexColors.SetColors(colors)
+    if vertexcolors:
+        if len(mesh.Vertices) != len(vertexcolors):
+            raise ValueError("The number of vertex colors does not match the number of vertices.")
+
+        colors = System.Array.CreateInstance(System.Drawing.Color, len(vertexcolors))
+        for index, color in enumerate(vertexcolors):
+            colors[index] = System.Drawing.Color.FromArgb(*color.rgb255)
+
+        mesh.VertexColors.SetColors(colors)
+    else:
+        if color:
+            mesh.VertexColors.CreateMonotoneMesh(System.Drawing.Color.FromArgb(*color.rgb255))
 
     # mesh.UnifyNormals()
     mesh.Normals.ComputeNormals()

src/compas_rhino/scene/meshobject.py

@@ -181,11 +181,19 @@ def draw(self):
         if self.show_faces is True:
             attr = self.compile_attributes()
 
+            vertexcolors = []
+            if len(self.vertexcolor):
+                vertexcolors = [self.vertexcolor[vertex] for vertex in self.mesh.vertices()]
+
+            facecolors = []
+            if len(self.facecolor):
+                facecolors = [self.facecolor[face] for face in self.mesh.faces()]
+
             geometry = mesh_to_rhino(
                 self.mesh,
                 color=self.color,
-                vertexcolors=self.vertexcolor,
-                facecolors=self.facecolor,
+                vertexcolors=vertexcolors,
+                facecolors=facecolors,
                 disjoint=self.disjoint,
             )