Optimization for "voronoi on solid".

d02ef06c · Ilya Portnov · 3d28cf5d · d02ef06c · d02ef06c · d02ef06c
--- a/nodes/solid/polygon_face.py
+++ b/nodes/solid/polygon_face.py
@@ -43,9 +43,9 @@ class SvSolidPolygonFaceNode(bpy.types.Node, SverchCustomTreeNode):
        for face_i in face_idxs:
            face_i = list(face_i)
            face_i.append(face_i[0])
-            verts = [verts[idx] for idx in face_i]
+            fc_verts = [verts[idx] for idx in face_i]
-            verts = [Base.Vector(*vert) for vert in verts]
+            fc_verts = [Base.Vector(*vert) for vert in fc_verts]
-            wire = Part.makePolygon(verts)
+            wire = Part.makePolygon(fc_verts)
            face = Part.Face(wire)
            surface = SvSolidFaceSurface(face)#.to_nurbs()
            result.append(surface)

--- a/nodes/spatial/voronoi_on_solid.py
+++ b/nodes/spatial/voronoi_on_solid.py
@@ -29,7 +29,7 @@ from sverchok.data_structure import updateNode, zip_long_repeat, throttle_and_up
 from sverchok.utils.sv_bmesh_utils import recalc_normals
 from sverchok.utils.voronoi3d import voronoi_on_solid
 from sverchok.utils.geom import scale_relative
-from sverchok.utils.solid import svmesh_to_solid, SvSolidTopology, SvGeneralFuse
+from sverchok.utils.solid import BMESH, svmesh_to_solid, SvSolidTopology, SvGeneralFuse
 from sverchok.utils.surface.freecad import SvSolidFaceSurface
 from sverchok.utils.dummy_nodes import add_dummy
 from sverchok.dependencies import scipy, FreeCAD

--- a/utils/solid.py
+++ b/utils/solid.py
@@ -454,7 +454,10 @@ def mefisto_mesher(solids, max_edge_length):
    return verts, faces
-def svmesh_to_solid(verts, faces, precision, remove_splitter=True):
+FCMESH = 'FCMESH'
+BMESH = 'BMESH'
+def svmesh_to_solid(verts, faces, precision=1e-6, remove_splitter=True, method=FCMESH):
    """
    input:
        verts: list of 3element iterables, [vector, vector...]
@@ -465,17 +468,33 @@ def svmesh_to_solid(verts, faces, precision, remove_splitter=True):
        a FreeCAD solid
    """
-    tri_faces = ensure_triangles(verts, faces, True)
+    if method == FCMESH:
-    faces_t = [[verts[c] for c in f] for f in tri_faces]
+        tri_faces = ensure_triangles(verts, faces, True)
-    mesh = Mesh.Mesh(faces_t)
+        faces_t = [[verts[c] for c in f] for f in tri_faces]
-    shape = Part.Shape()
+        mesh = Mesh.Mesh(faces_t)
-    shape.makeShapeFromMesh(mesh.Topology, precision)
+        shape = Part.Shape()
+        shape.makeShapeFromMesh(mesh.Topology, precision)
-    if remove_splitter:
-        # may slow it down, or be totally necessary
+        if remove_splitter:
-        shape = shape.removeSplitter() 
+            # may slow it down, or be totally necessary
+            shape = shape.removeSplitter() 
-    return Part.makeSolid(shape)
+        return Part.makeSolid(shape)
+    elif method == BMESH:
+        fc_faces = []
+        for face in faces:
+            face_i = list(face) + [face[0]]
+            face_verts = [Base.Vector(verts[i]) for i in face_i]
+            wire = Part.makePolygon(face_verts)
+            fc_face = Part.Face(wire)
+            fc_faces.append(fc_face)
+        shell = Part.makeShell(fc_faces)
+        solid = Part.makeSolid(shell)
+        if remove_splitter:
+            solid = solid.removeSplitter()
+        return solid
+    else:
+        raise Exception("Unsupported method")
 def mesh_from_solid_faces(solid):
    verts = [(v.X, v.Y, v.Z) for v in solid.Vertexes]