X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;h=b58637b7f76bb00515c82f29d211c7a380d51395;hb=7370746bcad955eb813418d0e1d5686f22c99369;hp=42b1b1bd054417a4156fbd247cfad37592f23785;hpb=9de2e31e844f1ad0ddbb592dcc5d62b2765e9130;p=libs%2Fgl.git diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py index 42b1b1bd..b58637b7 100644 --- a/blender/io_mspgl/mesh.py +++ b/blender/io_mspgl/mesh.py @@ -6,19 +6,19 @@ def make_edge_key(i1, i2): return (min(i1, i2), max(i1, i2)) class Edge: - def __init__(self, me): - if me.__class__==Edge: - self._medge = me._medge - self.vertices = me.vertices[:] - self.smooth = me.smooth + def __init__(self, edge): + if edge.__class__==Edge: + self._edge = edge._edge + self.vertices = edge.vertices[:] + self.smooth = edge.smooth else: - self._medge = me + self._edge = edge self.smooth = False - self.key = me.key + self.key = edge.key self.faces = [] def __getattr__(self, attr): - return getattr(self._medge, attr) + return getattr(self._edge, attr) def check_smooth(self, limit): if len(self.faces)!=2: @@ -44,27 +44,27 @@ class Edge: class Vertex: - def __init__(self, mv): - if mv.__class__==Vertex: - self._mvert = mv._mvert - self.uvs = mv.uvs[:] - self.tan = mv.tan - self.bino = mv.bino + def __init__(self, vertex): + if vertex.__class__==Vertex: + self._vertex = vertex._vertex + self.uvs = vertex.uvs[:] + self.tan = vertex.tan + self.bino = vertex.bino else: - self._mvert = mv + self._vertex = vertex self.uvs = [] self.tan = None self.bino = None - self.index = mv.index - self.co = mv.co - self.normal = mv.normal + self.index = vertex.index + self.co = vertex.co + self.normal = vertex.normal self.flag = False self.edges = [] self.faces = [] - self.groups = mv.groups[:] + self.groups = vertex.groups[:] def __getattr__(self, attr): - return getattr(self._mvert, attr) + return getattr(self._vertex, attr) def __cmp__(self, other): if other is None: @@ -73,26 +73,26 @@ class Vertex: class VertexGroup: - def __init__(self, base): - self._base = base - self.group = base.group - self.weight = base.weight + def __init__(self, group): + self._group = group + self.group = group.group + self.weight = group.weight def __getattr__(self, attr): - return getattr(self._mvert, attr) + return getattr(self._group, attr) class Face: - def __init__(self, mf): - self._mface = mf - self.index = mf.index + def __init__(self, face): + self._face = face + self.index = face.index self.edges = [] - self.vertices = mf.vertices[:] + self.vertices = face.vertices[:] self.uvs = [] self.flag = False def __getattr__(self, attr): - return getattr(self._mface, attr) + return getattr(self._face, attr) def __cmp__(self, other): if other is None: @@ -160,20 +160,24 @@ class UvLayer: class Mesh: - def __init__(self, m): - self._mesh = m + def __init__(self, mesh): + self._mesh = mesh - self.winding_test = m.winding_test - self.tbn_vecs = m.tbn_vecs - self.vertex_groups = m.vertex_groups + self.winding_test = mesh.winding_test + self.tbn_vecs = mesh.tbn_vecs + self.vertex_groups = mesh.vertex_groups + # Clone basic data self.vertices = [Vertex(v) for v in self.vertices] + for v in self.vertices: + v.groups = [VertexGroup(g) for g in v.groups] + 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[:] + + # Clone only the desired UV layers if self.use_uv=='NONE' or not self.uv_layers: self.uv_layers = [] else: @@ -183,15 +187,16 @@ class Mesh: if self.use_uv=='UNIT0': self.uv_layers = [self.uv_layers[0]] + # Assign texture unit numbers to UV layers that lack one next_unit = max((u.unit+1 for u in self.uv_layers if u.unit is not None), default=0) for u in self.uv_layers: if not u.unit: u.unit = next_unit next_unit += 1 - for v in self.vertices: - v.groups = [VertexGroup(g) for g in v.groups] - + # Rewrite links between elements to point to cloned data, or create links + # where they don't exist + 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 +206,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) @@ -210,6 +215,7 @@ class Mesh: for v in e.vertices: v.edges.append(e) + # Store loose edges as lines if self.use_lines: self.lines = [Line(e) for e in self.edges if not e.faces] else: @@ -229,6 +235,8 @@ class Mesh: if u.name!=other.uv_layers[i].name: raise ValueError("Meshes have incompatible UV layers") + # Merge materials and form a lookup from source material indices to the + # merged material list material_map = [] for m in other.materials: if m in self.materials: @@ -237,6 +245,8 @@ class Mesh: material_map.append(len(self.materials)) self.materials.append(m) + # Append data and adjust indices where necessary. Since the data is + # spliced from the source mesh, rebuilding references is not necessary. for i, u in enumerate(self.uv_layers): u.uvs += other.uv_layers[i].uvs @@ -262,7 +272,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 @@ -326,6 +335,8 @@ class Mesh: for i in f.loop_indices: layer.uvs[i] = uv + # Form a list of UV layers referenced by materials with the array atlas + # property set array_uv_layers = [t.uv_layer for m in self.materials if m.array_atlas for t in m.texture_slots if t and t.texture_coords=='UV'] array_uv_layers = [u for u in self.uv_layers if u.name in array_uv_layers] @@ -341,6 +352,7 @@ class Mesh: for i in f.loop_indices: l.uvs[i] = mathutils.Vector((*l.uvs[i], layer)) + # Copy UVs from layers to faces for f in self.faces: for u in self.uv_layers: f.uvs.append([u.uvs[i] for i in f.loop_indices]) @@ -348,6 +360,8 @@ class Mesh: prog_count = len(self.uv_layers) prog_step = 0 + # Split by the UV layer used for TBN vectors first so connectivity + # remains intact for TBN vector computation tbn_layer_index = -1 if self.tbn_vecs: uv_names = [u.name for u in self.uv_layers] @@ -361,6 +375,7 @@ class Mesh: progress.pop_task() prog_step = 2 + # Split by the remaining UV layers for i, u in enumerate(self.uv_layers): if i==tbn_layer_index: continue @@ -370,8 +385,10 @@ class Mesh: progress.pop_task() prog_step += 1 + # Copy UVs from faces to vertices for v in self.vertices: if v.faces: + # All faces still connected to the vertex have the same UV value f = v.faces[0] i = f.vertices.index(v) v.uvs = [u[i] for u in f.uvs] @@ -379,63 +396,58 @@ 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 = [] + # Find all groups of faces on this vertex + 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)) + # Give groups after the first separate copies of the vertex + 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)