X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;h=fb568ec416fb04739ef7b49c8b2bbd0a1f9f972e;hb=308dc6b8f5ee1aa3bb8f205e2ed6464749eebbe5;hp=da5e76aaf34ed259d48ff5f3a0b872c32f36cdda;hpb=f398c65c9e741ca4919a0770e096c15e8d33c1c2;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py
index da5e76aa..fb568ec4 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)
@@ -70,8 +68,12 @@ class Vertex:
 
 class VertexGroup:
 	def __init__(self, group):
-		self.group = group.group
-		self.weight = group.weight
+		if group:
+			self.group = group.group
+			self.weight = group.weight
+		else:
+			self.group = 0
+			self.weight = 0.0
 
 
 class Face:
@@ -156,14 +158,15 @@ 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_uvtex = mesh.tangent_uvtex
+		self.use_strips = mesh.use_strips
 		self.vertex_groups = mesh.vertex_groups
 
 		# Clone basic data
 		self.vertices = [Vertex(v) for v in mesh.vertices]
-		for v in self.vertices:
-			v.groups = [VertexGroup(g) for g in v.groups]
+		if self.vertex_groups:
+			for v in self.vertices:
+				v.groups = [VertexGroup(g) for g in v.groups]
 
 		self.faces = [Face(f) for f in mesh.polygons]
 		self.edges = [Edge(e) for e in mesh.edges]
@@ -172,6 +175,7 @@ class Mesh:
 
 		self.use_auto_smooth = mesh.use_auto_smooth
 		self.auto_smooth_angle = mesh.auto_smooth_angle
+		self.max_groups_per_vertex = mesh.max_groups_per_vertex
 
 		# Clone only the desired UV layers
 		if mesh.use_uv=='NONE' or not mesh.uv_layers:
@@ -203,7 +207,7 @@ class Mesh:
 		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")
+				raise ValueError("Unsupported face on mesh {}: N-gon".format(self.name))
 
 			f.vertices = [self.vertices[i] for i in f.vertices]
 			for v in f.vertices:
@@ -225,6 +229,21 @@ class Mesh:
 		else:
 			self.lines = []
 
+		# Check if tangent vectors are needed
+		if mesh.tangent_vecs=='NO':
+			self.tangent_vecs = False
+		elif mesh.tangent_vecs=='YES':
+			self.tangent_vecs = True
+		elif mesh.tangent_vecs=='AUTO':
+			from .material import Material
+			self.tangent_vecs = False
+			for m in self.materials:
+				mat = Material(m)
+				if mat.type=="pbr":
+					normal_prop = next((p for p in mat.properties if p.tex_keyword=="normal_map"), None)
+					if normal_prop and normal_prop.texture:
+						self.tangent_vecs = True
+
 		self.vertex_sequence = []
 
 	def transform(self, matrix):
@@ -233,19 +252,19 @@ class Mesh:
 
 	def splice(self, other):
 		if len(self.uv_layers)!=len(other.uv_layers):
-			raise ValueError("Meshes have incompatible UV layers")
+			raise ValueError("Meshes {} and {} have incompatible UV layers".format(self.name, other.name))
 		for i, u in enumerate(self.uv_layers):
 			if u.name!=other.uv_layers[i].name:
-				raise ValueError("Meshes have incompatible UV layers")
+				raise ValueError("Meshes {} and {} have incompatible UV layers".format(self.name, other.name))
 
 		# 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
@@ -276,7 +295,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
@@ -286,7 +305,7 @@ class Mesh:
 
 		self.lines += other.lines
 
-	def prepare_triangles(self, progress):
+	def prepare_triangles(self, task):
 		face_count = len(self.faces)
 		for i in range(face_count):
 			f = self.faces[i]
@@ -346,9 +365,9 @@ class Mesh:
 			f.normal = normals[1-cut_index]
 			nf.normal = normals[3-cut_index]
 
-			progress.set_progress(i/face_count)
+			task.set_progress(i/face_count)
 
-	def prepare_smoothing(self, progress):
+	def prepare_smoothing(self, task):
 		smooth_limit = -1
 		if self.smoothing=='NONE':
 			for f in self.faces:
@@ -361,16 +380,17 @@ class Mesh:
 		for e in self.edges:
 			e.check_smooth(smooth_limit)
 
-		progress.push_task("Sharp edges", 0.0, 0.7)
-		self.split_vertices(self.find_smooth_group, progress)
+		subtask = task.task("Sharp edges", 0.7)
+		self.split_vertices(self.find_smooth_group, subtask)
 
 		if self.smoothing!='BLENDER':
-			progress.set_task("Updating normals", 0.7, 1.0)
-			self.compute_normals(progress)
-
-		progress.pop_task()
+			subtask = task.task("Updating normals", 1.0)
+			self.compute_normals(subtask)
 
 	def prepare_vertex_groups(self, obj):
+		if not self.vertex_groups:
+			return
+
 		for v in self.vertices:
 			if v.groups:
 				weight_sum = sum(g.weight for g in v.groups)
@@ -378,6 +398,8 @@ class Mesh:
 				weight_scale = weight_sum/sum(g.weight for g in v.groups)
 				for g in v.groups:
 					g.weight *= weight_scale
+			while len(v.groups)<self.max_groups_per_vertex:
+				v.groups.append(VertexGroup(None))
 
 		if obj.parent and obj.parent.type=="ARMATURE":
 			armature = obj.parent.data
@@ -391,15 +413,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 {}".format(material_atlas.name, self.name))
 
 		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
@@ -411,11 +433,11 @@ 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
 
-	def prepare_uv(self, progress):
+	def prepare_uv(self, task):
 		# 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']
@@ -433,35 +455,38 @@ class Mesh:
 					for i in f.loop_indices:
 						l.uvs[i] = mathutils.Vector((*l.uvs[i], layer))
 
+		# 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:
+				raise Exception("Invalid configuration on mesh {}: No tangent UV layer".format(self.name))
+
 		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:
-				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.pop_task()
-				prog_step = 2
-			else:
-				raise Exception("TBN UV layer not found")
+		if tangent_layer_index>=0:
+			prog_count += 1
+		task.set_slices(prog_count)
+
+		if tangent_layer_index>=0:
+			subtask = task.next_slice("Computing tangents")
+			self.split_vertices(self.find_uv_group, subtask, tangent_layer_index)
+			subtask = task.next_slice(self.tangent_uvtex)
+			self.compute_tangents(tangent_layer_index, subtask)
 
 		# 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)
-			self.split_vertices(self.find_uv_group, progress, i)
-			progress.pop_task()
-			prog_step += 1
+			subtask = task.next_slice(u.name)
+			self.split_vertices(self.find_uv_group, subtask, i)
 
 		# Copy UVs from layers to vertices
 		for v in self.vertices:
@@ -473,11 +498,11 @@ class Mesh:
 			else:
 				v.uvs = [(0.0, 0.0)]*len(self.uv_layers)
 
-	def prepare_colors(self, progress):
+	def prepare_colors(self, task):
 		if not self.colors:
 			return
 
-		self.split_vertices(self.find_color_group, progress)
+		self.split_vertices(self.find_color_group, task)
 
 		for v in self.vertices:
 			if v.faces:
@@ -486,7 +511,7 @@ class Mesh:
 			else:
 				v.color = (1.0, 1.0, 1.0, 1.0)
 
-	def split_vertices(self, find_group_func, progress, *args):
+	def split_vertices(self, find_group_func, task, *args):
 		vertex_count = len(self.vertices)
 		for i in range(vertex_count):
 			v = self.vertices[i]
@@ -538,7 +563,7 @@ class Mesh:
 					f.vertices[f.vertices.index(v)] = nv
 					nv.faces.append(f)
 
-			progress.set_progress(i/vertex_count)
+			task.set_progress(i/vertex_count)
 
 	def find_smooth_group(self, vertex, face):
 		face.flag = True
@@ -584,7 +609,7 @@ class Mesh:
 
 		return group
 
-	def compute_normals(self, progress):
+	def compute_normals(self, task):
 		for i, v in enumerate(self.vertices):
 			v.normal = mathutils.Vector()
 			for f in v.faces:
@@ -602,16 +627,13 @@ class Mesh:
 			else:
 				v.normal = mathutils.Vector((0, 0, 1))
 
-			progress.set_progress(i/len(self.vertices))
+			task.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, task):
 		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]]]
@@ -627,20 +649,17 @@ 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))
+			task.set_progress(i/len(self.vertices))
 
-	def prepare_sequence(self, progress):
-		progress.push_task("Reordering faces", 0.0, 0.5)
-		self.reorder_faces(progress)
+	def prepare_sequence(self, task):
+		subtask = task.task("Reordering faces", 0.5)
+		self.reorder_faces(subtask)
 
-		progress.set_task("Building sequence", 0.5, 1.0)
+		subtask = task.task("Building sequence", 1.0)
 		sequence = None
 		for i, f in enumerate(self.faces):
 			if sequence:
@@ -667,13 +686,11 @@ class Mesh:
 				sequence = f.vertices[:]
 				self.vertex_sequence.append(sequence)
 
-			progress.set_progress(i/len(self.faces))
-
-		progress.pop_task()
+			subtask.set_progress(i/len(self.faces))
 
 		self.reorder_vertices()
 
-	def reorder_faces(self, progress):
+	def reorder_faces(self, task):
 		# Tom Forsyth's vertex cache optimization algorithm
 		# http://eelpi.gotdns.org/papers/fast_vert_cache_opt.html
 
@@ -749,7 +766,7 @@ class Mesh:
 			del cached_vertices[max_cache_size:]
 
 			n_processed += 1
-			progress.set_progress(n_processed/len(self.faces))
+			task.set_progress(n_processed/len(self.faces))
 
 		self.faces = reordered_faces
 		for i, f in enumerate(self.faces):
@@ -772,11 +789,11 @@ 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(ctx, obj, material_atlas):
 	if obj.type!="MESH":
-		raise Exception("Object is not a mesh")
+		raise Exception("Object {} is not a mesh".format(obj.name))
 
-	progress.push_task("Preparing mesh", 0.0, 0.2)
+	task = ctx.task("Collecting mesh data", 0.2)
 
 	objs = [(obj, mathutils.Matrix())]
 	i = 0
@@ -787,7 +804,7 @@ def create_mesh_from_object(context, obj, progress, *, material_map=None):
 			if c.type=="MESH" and c.compound:
 				objs.append((c, m*c.matrix_local))
 
-	dg = context.evaluated_depsgraph_get()
+	dg = ctx.context.evaluated_depsgraph_get()
 
 	mesh = None
 	for o, m in objs:
@@ -801,8 +818,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)
@@ -818,22 +835,20 @@ 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)
-	progress.set_task("Smoothing", 0.3, 0.5)
-	mesh.prepare_smoothing(progress)
-	progress.set_task("Vertex groups", 0.5, 0.6)
+	task = ctx.task("Triangulating", 0.3)
+	mesh.prepare_triangles(task)
+	task = ctx.task("Smoothing", 0.5)
+	mesh.prepare_smoothing(task)
+	task = ctx.task("Vertex groups", 0.6)
 	mesh.prepare_vertex_groups(obj)
-	progress.set_task("Preparing UVs", 0.6, 0.75)
-	mesh.prepare_uv(progress)
-	progress.set_task("Preparing vertex colors", 0.75, 0.85)
-	mesh.prepare_colors(progress)
-	progress.set_task("Render sequence", 0.85, 1.0)
-	mesh.prepare_sequence(progress)
-
-	progress.pop_task()
+	task = ctx.task("Preparing UVs", 0.75)
+	mesh.prepare_uv(task)
+	task = ctx.task("Preparing vertex colors", 0.85)
+	mesh.prepare_colors(task)
+	task = ctx.task("Render sequence", 1.0)
+	mesh.prepare_sequence(task)
 
 	return mesh