Simplify the vertex splitting algorithm

[libs/gl.git] / blender / io_mspgl / mesh.py

diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py
index 565fdc4929e3a9db1deaecb0ecf8efd3695e378a..077acc2e57014227a652ad64ff268061b18c1e7b 100644 (file)
--- a/blender/io_mspgl/mesh.py
+++ b/blender/io_mspgl/mesh.py
@@ -170,7 +170,6 @@ class Mesh:
                self.vertices = [Vertex(v) for v in self.vertices]
                self.faces = [Face(f) for f in self.polygons]
                self.edges = [Edge(e) for e in self.edges]
-               self.edge_map = {e.key: e for e in self.edges}
                self.loops = self.loops[:]
 
                self.materials = self.materials[:]
@@ -192,6 +191,7 @@ class Mesh:
                for v in self.vertices:
                        v.groups = [VertexGroup(g) for g in v.groups]
 
+               edge_map = {e.key: e for e in self.edges}
                for f in self.faces:
                        if len(f.vertices)>4:
                                raise ValueError("Ngons are not supported")
@@ -201,7 +201,7 @@ class Mesh:
                                v.faces.append(f)
 
                        for k in f.edge_keys:
-                               e = self.edge_map[k]
+                               e = edge_map[k]
                                e.faces.append(f)
                                f.edges.append(e)
 
@@ -262,7 +262,6 @@ class Mesh:
                for e in self.edges[offset:]:
                        e.index += offset
                        e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index)
-                       self.edge_map[e.key] = e
 
                self.lines += other.lines
 
@@ -355,9 +354,9 @@ class Mesh:
                                prog_count += 1
                                tbn_layer_index = uv_names.index(self.tbn_uvtex)
                                progress.push_task_slice("Computing TBN", 0, prog_count)
-                               self.compute_tbn(tbn_layer_index, progress)
-                               progress.set_task_slice(self.tbn_uvtex, 1, prog_count)
                                self.split_vertices(self.find_uv_group, progress, tbn_layer_index)
+                               progress.set_task_slice(self.tbn_uvtex, 1, prog_count)
+                               self.compute_tbn(tbn_layer_index, progress)
                                progress.pop_task()
                                prog_step = 2
 
@@ -379,61 +378,54 @@ class Mesh:
                                v.uvs = [(0.0, 0.0)]*len(self.uv_layers)
 
        def split_vertices(self, find_group_func, progress, *args):
-               groups = []
-               for i in range(len(self.vertices)):
+               vertex_count = len(self.vertices)
+               for i in range(vertex_count):
                        v = self.vertices[i]
                        for f in v.faces:
                                f.flag = False
 
-                       vg = []
+                       groups = []
                        for f in v.faces:
                                if not f.flag:
-                                       vg.append(find_group_func(v, f, *args))
-
-                       groups.append(vg)
+                                       groups.append(find_group_func(v, f, *args))
 
-                       progress.set_progress(i*0.5/len(self.vertices))
+                       for g in groups[1:]:
+                               nv = Vertex(v)
+                               nv.index = len(self.vertices)
+                               self.vertices.append(nv)
 
-               for i in range(len(self.vertices)):
-                       for g in groups[i][1:]:
-                               v = Vertex(self.vertices[i])
-                               v.index = len(self.vertices)
-                               self.vertices.append(v)
-
-                               v_edges = []
-                               for e in self.vertices[i].edges:
+                               for e in v.edges:
                                        e_faces_in_g = [f for f in e.faces if f in g]
-                                       if e_faces_in_g:
-                                               boundary = len(e_faces_in_g)<len(e.faces)
-                                               v_edges.append((e, boundary, e_faces_in_g))
+                                       if not e_faces_in_g:
+                                               continue
 
-                               for e, boundary, e_faces_in_g in v_edges:
-                                       if boundary:
+                                       if len(e_faces_in_g)<len(e.faces):
                                                ne = Edge(e)
                                                ne.index = len(self.edges)
                                                self.edges.append(ne)
 
+                                               ne.other_vertex(v).edges.append(ne)
+
                                                for f in e_faces_in_g:
                                                        e.faces.remove(f)
                                                        f.edges[f.edges.index(e)] = ne
                                                        ne.faces.append(f)
+
                                                e = ne
-                                       else:
-                                               del self.edge_map[e.key]
-                                               self.vertices[i].edges.remove(e)
-                                               v.edges.append(e)
 
-                                       e.vertices[e.vertices.index(self.vertices[i])] = v
+                                       e.vertices[e.vertices.index(v)] = nv
+                                       nv.edges.append(e)
 
                                        e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index)
-                                       self.edge_map[e.key] = e
+
+                               v.edges = [e for e in v.edges if v in e.vertices]
 
                                for f in g:
-                                       self.vertices[i].faces.remove(f)
-                                       f.vertices[f.vertices.index(self.vertices[i])] = v
-                                       v.faces.append(f)
+                                       v.faces.remove(f)
+                                       f.vertices[f.vertices.index(v)] = nv
+                                       nv.faces.append(f)
 
-                       progress.set_progress(0.5+i*0.5/len(self.vertices))
+                       progress.set_progress(i/vertex_count)
 
        def find_smooth_group(self, vertex, face):
                face.flag = True