Merge branch 'main' of https://github.com/compas-dev/compas into rhino_brep

chenkasirer · chenkasirer · commit 115cd0126c8e · 2022-12-07T17:24:13.000+01:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.17.3
+current_version = 1.17.4
 message = Bump version to {new_version}
 commit = True
 tag = True
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,12 +15,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+### Removed
+
+
+## [1.17.4] 2022-12-06
+
+### Added
+
+* Added option for per-vertex color specification to `compas_rhino.utilities.drawing.draw_mesh`.
+
+### Changed
+
 * Fixed strange point values in RhinoNurbsCurve caused by conversion `ControlPoint` to COMPAS instead of `ControlPoint.Location`.
 * Fixed flipped order of NURBS point count values when creating RhinoNurbsSurface from parameters.
 * Changed serialization format and reconstruction procedure of `RhinoBrep`.
 
 ### Removed
 
+* Removed Python 3.6 from build workflows as it reached end-of-life at the end of 2021.
+
 
 ## [1.17.3] 2022-11-09
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -42,7 +42,7 @@ def patched_m2r2_setup(app):
 copyright = "Block Research Group - ETH Zurich"
 author = "Tom Van Mele"
 
-release = "1.17.3"
+release = "1.17.4"
 version = ".".join(release.split(".")[0:2])
 
 master_doc = "index"
diff --git a/setup.py b/setup.py
@@ -13,9 +13,7 @@
 
 
 def read(*names, **kwargs):
-    return io.open(
-        path.join(here, *names), encoding=kwargs.get("encoding", "utf8")
-    ).read()
+    return io.open(path.join(here, *names), encoding=kwargs.get("encoding", "utf8")).read()
 
 
 long_description = read("README.md")
@@ -24,7 +22,7 @@ def read(*names, **kwargs):
 
 setup(
     name="COMPAS",
-    version="1.17.3",
+    version="1.17.4",
     description="The COMPAS framework",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -42,7 +40,6 @@ def read(*names, **kwargs):
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
diff --git a/src/compas/__init__.py b/src/compas/__init__.py
@@ -50,7 +50,7 @@
 __license__ = "MIT License"
 __email__ = "vanmelet@ethz.ch"
 
-__version__ = "1.17.3"
+__version__ = "1.17.4"
 
 version = LooseVersion(compas.__version__)
 versionstring = version.vstring.split("-")[0]
diff --git a/src/compas_blender/__init__.py b/src/compas_blender/__init__.py
@@ -51,7 +51,7 @@ def redraw():
     bpy.ops.wm.redraw_timer(type="DRAW_WIN_SWAP", iterations=1)
 
 
-__version__ = "1.17.3"
+__version__ = "1.17.4"
 
 
 def _check_blender_version(version):
diff --git a/src/compas_ghpython/__init__.py b/src/compas_ghpython/__init__.py
@@ -20,7 +20,7 @@
 import compas
 import compas_rhino
 
-__version__ = "1.17.3"
+__version__ = "1.17.4"
 
 if compas.is_rhino():
     from .utilities import *  # noqa: F401 F403
diff --git a/src/compas_plotters/__init__.py b/src/compas_plotters/__init__.py
@@ -14,7 +14,7 @@
 
 """
 
-__version__ = "1.17.3"
+__version__ = "1.17.4"
 
 from .core import *  # noqa: F401 F403
 
diff --git a/src/compas_rhino/__init__.py b/src/compas_rhino/__init__.py
@@ -29,7 +29,7 @@
     from .utilities import *  # noqa: F401 F403
 
 
-__version__ = "1.17.3"
+__version__ = "1.17.4"
 
 
 PURGE_ON_DELETE = True
diff --git a/src/compas_rhino/utilities/drawing.py b/src/compas_rhino/utilities/drawing.py
@@ -757,7 +757,7 @@ def draw_spheres(spheres, **kwargs):
 
 
 @wrap_drawfunc
-def draw_mesh(vertices, faces, name=None, color=None, disjoint=False, **kwargs):
+def draw_mesh(vertices, faces, name=None, color=None, vertex_color=None, disjoint=False, **kwargs):
     """Draw a mesh and optionally set individual name, color, and layer properties.
 
     Parameters
@@ -767,7 +767,13 @@ def draw_mesh(vertices, faces, name=None, color=None, disjoint=False, **kwargs):
     faces : list[list[int]]
         A list of faces as lists of indices into `vertices`.
     name : str, optional
+        The name of the mesh object in Rhino.
     color : tuple[[int, int, int]], optional
+        The base color of the mesh.
+    vertex_color : dict[int, tuple[int, int, int]], optional
+        A color per vertex of the mesh.
+        Vertices without a color specification in this mapping, will receive the base color.
+        For example: ``vertex_color = {vertex: Color.from_i(random.random()).rgb255 for face in faces for vertex in face}``
     disjoint : bool, optional
         If True, draw the mesh with disjoint faces.
 
@@ -776,7 +782,19 @@ def draw_mesh(vertices, faces, name=None, color=None, disjoint=False, **kwargs):
     System.Guid
 
     """
+
+    def average_color(colors):
+        c = len(colors)
+        r, g, b = zip(*colors)
+        r = sum(r) / c
+        g = sum(g) / c
+        b = sum(b) / c
+        return int(r), int(g), int(b)
+
+    vertex_color = vertex_color or {}
+    vertexcolors = []
     mesh = RhinoMesh()
+
     if disjoint:
         for face in faces:
             f = len(face)
@@ -786,29 +804,44 @@ def draw_mesh(vertices, faces, name=None, color=None, disjoint=False, **kwargs):
                 a = mesh.Vertices.Add(*vertices[face[0]])
                 b = mesh.Vertices.Add(*vertices[face[1]])
                 c = mesh.Vertices.Add(*vertices[face[2]])
+                vertexcolors.append(vertex_color.get(face[0], color))
+                vertexcolors.append(vertex_color.get(face[1], color))
+                vertexcolors.append(vertex_color.get(face[2], color))
                 mesh.Faces.AddFace(a, b, c)
             elif f == 4:
                 a = mesh.Vertices.Add(*vertices[face[0]])
                 b = mesh.Vertices.Add(*vertices[face[1]])
                 c = mesh.Vertices.Add(*vertices[face[2]])
                 d = mesh.Vertices.Add(*vertices[face[3]])
+                vertexcolors.append(vertex_color.get(face[0], color))
+                vertexcolors.append(vertex_color.get(face[1], color))
+                vertexcolors.append(vertex_color.get(face[2], color))
+                vertexcolors.append(vertex_color.get(face[3], color))
                 mesh.Faces.AddFace(a, b, c, d)
             else:
                 if MeshNgon:
+                    cornercolors = [vertex_color.get(vertex, color) for vertex in face]
+                    vertexcolors += cornercolors
+                    vertexcolors.append(average_color(cornercolors))
+
                     points = [vertices[vertex] for vertex in face]
                     centroid = centroid_polygon(points)
                     indices = []
                     for point in points:
                         indices.append(mesh.Vertices.Add(*point))
                     c = mesh.Vertices.Add(*centroid)
+
                     facets = []
                     for i, j in pairwise(indices + indices[:1]):
                         facets.append(mesh.Faces.AddFace(i, j, c))
                     ngon = MeshNgon.Create(indices, facets)
                     mesh.Ngons.AddNgon(ngon)
+
     else:
-        for x, y, z in vertices:
+        for index, (x, y, z) in enumerate(vertices):
             mesh.Vertices.Add(x, y, z)
+            vertexcolors.append(vertex_color.get(index, color))
+
         for face in faces:
             f = len(face)
             if f < 3:
@@ -819,8 +852,12 @@ def draw_mesh(vertices, faces, name=None, color=None, disjoint=False, **kwargs):
                 mesh.Faces.AddFace(*face)
             else:
                 if MeshNgon:
+                    cornercolors = [vertex_color.get(index, color) for index in face]
+                    vertexcolors.append(average_color(cornercolors))
+
                     centroid = centroid_polygon([vertices[index] for index in face])
                     c = mesh.Vertices.Add(*centroid)
+
                     facets = []
                     for i, j in pairwise(face + face[:1]):
                         facets.append(mesh.Faces.AddFace(i, j, c))
@@ -833,6 +870,12 @@ def draw_mesh(vertices, faces, name=None, color=None, disjoint=False, **kwargs):
     guid = add_mesh(mesh)
 
     if guid != System.Guid.Empty:
+        if vertexcolors:
+            try:
+                compas_rhino.set_mesh_vertex_colors(guid, vertexcolors)
+            except Exception:
+                pass
+
         obj = find_object(guid)
         if obj:
             attr = obj.Attributes
