Merge remote-tracking branch 'origin/main' into main

Author: tomvanmele

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Added optional `triangulated` flag to `Mesh.to_vertices_and_faces`.
+* Added geometry information of active meshes to the serialization/deserialization of robot model's `MeshDescriptor`.
+* Added Grasshopper component to draw any COMPAS object.
+* Added new icons to Grasshopper components and default to icon style.
 
 ### Changed
 

src/compas/robots/model/geometry.py

@@ -173,13 +173,15 @@ def data(self):
             'filename': self.filename,
             'scale': self.scale,
             'attr': _attr_to_data(self.attr),
+            'meshes': [m.data for m in self.meshes],
         }
 
     @data.setter
     def data(self, data):
         self.filename = data['filename']
         self.scale = data['scale']
         self.attr = _attr_from_data(data['attr']) if 'attr' in data else {}
+        self.meshes = [Mesh.from_data(md) for md in data['meshes']] if 'meshes' in data else []
 
     @classmethod
     def from_data(cls, data):
@@ -364,6 +366,7 @@ def get_color(self):
     ('point', 'radius'): compas.geometry.Sphere,
     ('line', 'radius'): compas.geometry.Capsule,
     ('attr', 'filename', 'scale'): MeshDescriptor,
+    ('attr', 'filename', 'meshes', 'scale'): MeshDescriptor,
 }
 
 

src/compas_ghpython/components/Compas_Frame/code.py

@@ -8,6 +8,9 @@
 
 class CompasInfo(component):
     def RunScript(self, json):
+        if not json:
+            return None
+
         try:
             return compas.json_load(json)
         except:    # noqa: E722

src/compas_ghpython/components/Compas_Frame/icon.png

@@ -8,6 +8,7 @@
 
     "ghpython": {
         "isAdvancedMode": true,
+        "iconDisplay": 2,
         "inputParameters": [
             {
                 "name": "json",

src/compas_ghpython/components/Compas_Frame/metadata.json

@@ -8,6 +8,7 @@
 
     "ghpython": {
         "isAdvancedMode": true,
+        "iconDisplay": 2,
         "inputParameters": [
         ],
         "outputParameters": [