fix frame subd bug and add subd schemes

Author: tomvanmele

CHANGELOG.md

@@ -8,21 +8,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-
 ### Added
 
 * Added Python 3.9 support.
 * Added crease handling to catmull-clark subdivision scheme.
 * Added `compas_ghpython.get_grasshopper_userobjects_path` to retrieve User Objects target folder.
 * Added direction option for mesh thickening.
 * Added check for closed meshes.
+* Added 'loop' and 'frames' to schemes of `compas.datastructures.mesh.subdivision.mesh_subdivide`.
 
 ### Changed
 
 * Fixed box scaling.
 * Fixed a bug in `Polyline.divide_polyline_by_length` related to a floating point rounding error.
 * Fixed bug in `RobotModel.zero_configuration`.
 * Fixed bug in `compas.geometry.normals`.
+* Fixed bug in `compas.datastructures.mesh.subdivision.mesh_subdivide_frames`.
 
 ### Removed
 

src/compas/datastructures/mesh/subdivision.py

@@ -100,7 +100,7 @@ def mesh_subdivide(mesh, scheme='catmullclark', **options):
     ----------
     mesh : Mesh
         A mesh object.
-    scheme : {'tri', 'quad', 'corner', 'catmullclark', 'doosabin'}, optional
+    scheme : {'tri', 'quad', 'corner', 'catmullclark', 'doosabin', 'frames', 'loop'}, optional
         The scheme according to which the mesh should be subdivided.
         Default is ``'catmullclark'``.
     options : dict
@@ -127,6 +127,10 @@ def mesh_subdivide(mesh, scheme='catmullclark', **options):
         return mesh_subdivide_catmullclark(mesh, **options)
     if scheme == 'doosabin':
         return mesh_subdivide_doosabin(mesh, **options)
+    if scheme == 'frames':
+        return mesh_subdivide_frames(mesh, **options)
+    if scheme == 'loop':
+        return trimesh_subdivide_loop(mesh, **options)
 
     raise ValueError('Scheme is not supported')
 
@@ -584,6 +588,7 @@ def mesh_subdivide_frames(mesh, offset, add_windows=False):
     >>>
 
     """
+    cls = type(mesh)
 
     subd = SubdMesh()
 
@@ -626,7 +631,7 @@ def mesh_subdivide_frames(mesh, offset, add_windows=False):
         if add_windows:
             subd.add_face(window)
 
-    return subd
+    return cls.from_data(subd.data)
 
 
 def trimesh_subdivide_loop(mesh, k=1, fixed=None):
@@ -761,8 +766,7 @@ def trimesh_subdivide_loop(mesh, k=1, fixed=None):
 
             del subd.face[fkey]
 
-    subd2 = cls.from_data(subd.data)
-    return subd2
+    return cls.from_data(subd.data)
 
 
 # ==============================================================================