X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;h=f5665256b2eeced61c654abc329d4849e45d82cf;hb=9ab994ab4fedf938cbbdfe1ec1415e6c91844d21;hp=4403c6a01dd92a2d1b2eff36cf95cd4e9853a120;hpb=736a076cf12aca02492eae6c77eff846bde0cdda;p=libs%2Fgl.git diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py index 4403c6a0..f5665256 100644 --- a/blender/io_mspgl/mesh.py +++ b/blender/io_mspgl/mesh.py @@ -9,10 +9,8 @@ def make_edge_key(i1, i2): class Edge: def __init__(self, edge): if edge.__class__==Edge: - self._edge = edge._edge self.smooth = edge.smooth else: - self._edge = edge self.smooth = False if edge: self.vertices = edge.vertices[:] @@ -22,9 +20,6 @@ class Edge: self.key = None self.faces = [] - def __getattr__(self, attr): - return getattr(self._edge, attr) - def check_smooth(self, limit): if len(self.faces)!=2: return @@ -51,12 +46,10 @@ class Edge: class Vertex: 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._vertex = vertex self.uvs = [] self.tan = None self.bino = None @@ -68,9 +61,6 @@ class Vertex: self.faces = [] self.groups = vertex.groups[:] - def __getattr__(self, attr): - return getattr(self._vertex, attr) - def __cmp__(self, other): if other is None: return 1 @@ -79,26 +69,22 @@ class Vertex: class VertexGroup: def __init__(self, group): - self._group = group self.group = group.group self.weight = group.weight - def __getattr__(self, attr): - return getattr(self._group, attr) - class Face: def __init__(self, face): - self._face = face self.index = face.index self.edges = [] + self.edge_keys = face.edge_keys self.vertices = face.vertices[:] - self.uvs = [] + self.loop_indices = face.loop_indices + self.normal = face.normal + self.use_smooth = face.use_smooth + self.material_index = face.material_index self.flag = False - def __getattr__(self, attr): - return getattr(self._face, attr) - def __cmp__(self, other): if other is None: return 1 @@ -108,12 +94,8 @@ class Face: n = self.vertices.index(v) return [(n+i)%len(self.vertices) for i in range(len(self.vertices))] - def pivot_vertices(self, *vt): - flags = [(v in vt) for v in self.vertices] - l = len(self.vertices) - for i in range(l): - if flags[i] and not flags[(i+l-1)%l]: - return self.vertices[i:]+self.vertices[:i] + def get_loop_index(self, v): + return self.loop_indices[self.vertices.index(v)] def get_edge(self, v1, v2): key = make_edge_key(v1.index, v2.index) @@ -142,13 +124,11 @@ class Line: class UvLayer: def __init__(self, arg): if type(arg)==str: - self._layer = None self.name = arg self.uvs = [] else: - self._layer = arg self.name = arg.name - self.uvs = [mathutils.Vector(d.uv) for d in self.data] + self.uvs = [mathutils.Vector(d.uv) for d in arg.data] self.unit = None self.hidden = False @@ -161,17 +141,16 @@ class UvLayer: elif ext==".hidden": self.hidden = True - def __getattr__(self, attr): - return getattr(self._layer, attr) - class Mesh: def __init__(self, mesh): - self._mesh = mesh self.name = mesh.name self.winding_test = mesh.winding_test + self.smoothing = mesh.smoothing + self.use_uv = mesh.use_uv self.tbn_vecs = mesh.tbn_vecs + self.tbn_uvtex = mesh.tbn_uvtex self.vertex_groups = mesh.vertex_groups # Clone basic data @@ -184,8 +163,11 @@ class Mesh: self.loops = mesh.loops[:] self.materials = mesh.materials[:] + self.use_auto_smooth = mesh.use_auto_smooth + self.auto_smooth_angle = mesh.auto_smooth_angle + # Clone only the desired UV layers - if self.use_uv=='NONE' or not mesh.uv_layers: + if mesh.use_uv=='NONE' or not mesh.uv_layers: self.uv_layers = [] else: self.uv_layers = [UvLayer(u) for u in mesh.uv_layers] @@ -200,7 +182,7 @@ class Mesh: self.uv_layers = sorted(self.uv_layers, key=(lambda u: u.unit)) - if self.use_uv=='UNIT0': + if mesh.use_uv=='UNIT0': self.uv_layers = [self.uv_layers[0]] if self.uv_layers[0].unit!=0: self.uv_layers = [] @@ -227,16 +209,13 @@ class Mesh: v.edges.append(e) # Store loose edges as lines - if self.use_lines: + if mesh.use_lines: self.lines = [Line(e) for e in self.edges if not e.faces] else: self.lines = [] self.vertex_sequence = [] - def __getattr__(self, attr): - return getattr(self._mesh, attr) - def transform(self, matrix): for v in self.vertices: v.co = matrix@v.co @@ -434,11 +413,6 @@ 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]) - prog_count = len(self.uv_layers) prog_step = 0 @@ -456,6 +430,8 @@ class Mesh: self.compute_tbn(tbn_layer_index, progress) progress.pop_task() prog_step = 2 + else: + raise Exception("TBN UV layer not found") # Split by the remaining UV layers for i, u in enumerate(self.uv_layers): @@ -467,13 +443,13 @@ class Mesh: progress.pop_task() prog_step += 1 - # Copy UVs from faces to vertices + # Copy UVs from layers 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] + i = f.get_loop_index(v) + v.uvs = [u.uvs[i] for u in self.uv_layers] else: v.uvs = [(0.0, 0.0)]*len(self.uv_layers) @@ -551,12 +527,13 @@ class Mesh: return group def find_uv_group(self, vertex, face, index): - uv = face.uvs[index][face.vertices.index(vertex)] + layer = self.uv_layers[index] + uv = layer.uvs[face.get_loop_index(vertex)] face.flag = True group = [face] for f in vertex.faces: - if not f.flag and f.uvs[index][f.vertices.index(vertex)]==uv: + if not f.flag and layer.uvs[f.get_loop_index(vertex)]==uv: f.flag = True group.append(f) @@ -566,9 +543,9 @@ class Mesh: for i, v in enumerate(self.vertices): v.normal = mathutils.Vector() for f in v.faces: - fv = f.pivot_vertices(v) - edge1 = fv[1].co-fv[0].co - edge2 = fv[-1].co-fv[0].co + vi = f.pivot_vertex(v) + edge1 = f.vertices[vi[1]].co-v.co + edge2 = f.vertices[vi[-1]].co-v.co if edge1.length and edge2.length: # Use the angle between edges as a weighting factor. This gives # more consistent normals on bends with an inequal number of @@ -749,19 +726,6 @@ class Mesh: for e in self.edges: e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index) - def drop_references(self): - for v in self.vertices: - v._vertex = None - for g in v.groups: - g._group = None - for e in self.edges: - e._edge = None - for f in self.faces: - f._face = None - for u in self.uv_layers: - u._layer = None - self._mesh = None - def create_mesh_from_object(context, obj, progress, *, material_map=None): if obj.type!="MESH": @@ -823,10 +787,6 @@ def create_mesh_from_object(context, obj, progress, *, material_map=None): progress.set_task("Render sequence", 0.8, 1.0) mesh.prepare_sequence(progress) - # Discard the temporary Blender meshes after making sure there's no - # references to the data - mesh.drop_references() - progress.pop_task() return mesh