X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;h=9741b8dd916f28495d3e25cde8fd64e767a7d118;hp=d9ae6b760ff545c8043269bb9e120b597f8b05f7;hb=86721a55699193e63c76e8a0a7b0ced0416c1cce;hpb=e1d07383b29e8581230b50f45606192d1f21f5dd diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py index d9ae6b76..9741b8dd 100644 --- a/blender/io_mspgl/mesh.py +++ b/blender/io_mspgl/mesh.py @@ -48,11 +48,9 @@ class Vertex: if vertex.__class__==Vertex: self.uvs = vertex.uvs[:] self.tan = vertex.tan - self.bino = vertex.bino else: self.uvs = [] self.tan = None - self.bino = None self.index = vertex.index self.co = mathutils.Vector(vertex.co) self.normal = mathutils.Vector(vertex.normal) @@ -160,8 +158,8 @@ class Mesh: 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.tangent_vecs = mesh.tangent_vecs + self.tangent_uvtex = mesh.tangent_uvtex self.vertex_groups = mesh.vertex_groups # Clone basic data @@ -246,12 +244,12 @@ class Mesh: # Merge materials and form a lookup from source material indices to the # merged material list - material_map = [] + material_atlas = [] for m in other.materials: if m in self.materials: - material_map.append(self.materials.index(m)) + material_atlas.append(self.materials.index(m)) else: - material_map.append(len(self.materials)) + material_atlas.append(len(self.materials)) self.materials.append(m) # Append data and adjust indices where necessary. Since the data is @@ -282,7 +280,7 @@ class Mesh: f.index += offset f.loop_indices = range(f.loop_indices.start+offset, f.loop_indices.stop+offset) if other.materials: - f.material_index = material_map[f.material_index] + f.material_index = material_atlas[f.material_index] offset = len(self.edges) self.edges += other.edges @@ -402,15 +400,15 @@ class Mesh: for g in v.groups: g.group = group_index_map[g.group] - def apply_material_map(self, material_map): + def apply_material_atlas(self, material_atlas): for m in self.materials: - if m.name not in material_map.material_names: - raise Exception("Material map is not compatible with Mesh") + if m.name not in material_atlas.material_names: + raise Exception("Material atlas is not compatible with Mesh") if self.use_uv=='NONE': return - layer = UvLayer("material_map") + layer = UvLayer("material_atlas") if self.use_uv=='UNIT0': self.uv_layers = [layer] layer.unit = 0 @@ -422,7 +420,7 @@ class Mesh: layer.uvs = [(0.0, 0.0)]*len(self.loops) for f in self.faces: - uv = material_map.get_material_uv(self.materials[f.material_index]) + uv = material_atlas.get_material_uv(self.materials[f.material_index]) for i in f.loop_indices: layer.uvs[i] = uv @@ -447,26 +445,31 @@ 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] - if self.tbn_uvtex in uv_names: + # Split by the UV layer used for tangent vectors first so connectivity + # remains intact for tangent vector computation + tangent_layer_index = -1 + if self.tangent_vecs: + if self.tangent_uvtex: + uv_names = [u.name for u in self.uv_layers] + if self.tangent_uvtex in uv_names: + tangent_layer_index = uv_names.index(self.tangent_uvtex) + elif self.uv_layers[0].unit==0: + tangent_layer_index = 0 + + if tangent_layer_index>=0: prog_count += 1 - tbn_layer_index = uv_names.index(self.tbn_uvtex) - progress.push_task_slice("Computing TBN", 0, 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.push_task_slice("Computing tangents", 0, prog_count) + self.split_vertices(self.find_uv_group, progress, tangent_layer_index) + progress.set_task_slice(self.tangent_uvtex, 1, prog_count) + self.compute_tangents(tangent_layer_index, progress) progress.pop_task() prog_step = 2 else: - raise Exception("TBN UV layer not found") + raise Exception("Tangent UV layer not found") # Split by the remaining UV layers for i, u in enumerate(self.uv_layers): - if i==tbn_layer_index: + if i==tangent_layer_index: continue progress.push_task_slice(u.name, prog_step, prog_count) @@ -615,14 +618,11 @@ class Mesh: progress.set_progress(i/len(self.vertices)) - def compute_tbn(self, index, progress): - # This function is called at an early stage during UV preparation when - # face UVs are not available yet + def compute_tangents(self, index, progress): layer_uvs = self.uv_layers[index].uvs for i, v in enumerate(self.vertices): v.tan = mathutils.Vector() - v.bino = mathutils.Vector() for f in v.faces: vi = f.pivot_vertex(v) uv0 = layer_uvs[f.loop_indices[vi[0]]] @@ -638,12 +638,9 @@ class Mesh: if div: mul = edge1.angle(edge2)/div v.tan += (edge1*dv2-edge2*dv1)*mul - v.bino += (edge2*du1-edge1*du2)*mul if v.tan.length: v.tan.normalize() - if v.bino.length: - v.bino.normalize() progress.set_progress(i/len(self.vertices)) @@ -783,7 +780,7 @@ class Mesh: e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index) -def create_mesh_from_object(context, obj, progress, *, material_map=None): +def create_mesh_from_object(context, obj, progress, *, material_atlas=None): if obj.type!="MESH": raise Exception("Object is not a mesh") @@ -812,8 +809,8 @@ def create_mesh_from_object(context, obj, progress, *, material_map=None): bmesh.vertex_groups = o.data.vertex_groups bmesh.max_groups_per_vertex = o.data.max_groups_per_vertex bmesh.use_uv = o.data.use_uv - bmesh.tbn_vecs = o.data.tbn_vecs - bmesh.tbn_uvtex = o.data.tbn_uvtex + bmesh.tangent_vecs = o.data.tangent_vecs + bmesh.tangent_uvtex = o.data.tangent_uvtex me = Mesh(bmesh) me.transform(m) @@ -829,8 +826,8 @@ def create_mesh_from_object(context, obj, progress, *, material_map=None): mesh.name = obj.data.name - if material_map: - mesh.apply_material_map(material_map) + if material_atlas: + mesh.apply_material_atlas(material_atlas) progress.set_task("Triangulating", 0.2, 0.3) mesh.prepare_triangles(progress)