X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=3873bf329e627f2d108085b73cc0ca76b1c2b8af;hb=9d8e4aa5a9573b34fe06455af249c762433d47c0;hp=cae0e5894b97fa05f6f9fa21bd3c2f2b6bdc03b9;hpb=af4769679fc41cfd95bb12777423f7672ba5f661;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index cae0e589..3873bf32 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -1,5 +1,6 @@
 import itertools
 import bpy
+import mathutils
 
 class VertexCache:
 	def __init__(self, size):
@@ -40,15 +41,8 @@ class MeshExporter:
 		self.max_strip_len = 1024
 		self.optimize_cache = True
 		self.cache_size = 64
-		self.export_lines = False
-		self.export_uv = "UNIT0"
-		self.tbn_vecs = False
-		self.tbn_uvtex = ""
 		self.compound = False
 		self.material_tex = False
-		self.smoothing = "MSPGL"
-		self.export_groups = False
-		self.max_groups = 2
 
 	def stripify(self, mesh, progress=None):
 		for f in mesh.faces:
@@ -63,6 +57,7 @@ class MeshExporter:
 			cache = VertexCache(self.cache_size)
 
 		island = []
+		face_neighbors = []
 		island_strips = []
 		while 1:
 			if not island:
@@ -82,11 +77,13 @@ class MeshExporter:
 					face = queue.pop(0)
 					island.append(face)
 
-					for n in f.get_neighbors():
+					for n in face.get_neighbors():
 						if not n.flag:
 							n.flag = True
 							queue.append(n)
 
+				face_neighbors = [f.get_neighbors() for f in island]
+
 				# Unflag the island for the next phase
 				for f in island:
 					f.flag = False
@@ -96,11 +93,11 @@ class MeshExporter:
 			# or along borders of a non-closed island.
 			best = 5
 			face = None
-			for f in island:
+			for i, f in enumerate(island):
 				if f.flag:
 					continue
 
-				score = sum(not n.flag for n in f.get_neighbors())
+				score = sum(not n.flag for n in face_neighbors[i])
 				if score>0 and score<best:
 					face = f
 					best = score
@@ -193,24 +190,27 @@ class MeshExporter:
 		return strips, loose
 
 	def export(self, context, out_file, objs=None, progress=None):
+		if objs:
+			objs = [(o, mathutils.Matrix()) for o in objs]
+
 		if self.compound:
 			if objs is None:
-				objs = context.selected_objects
+				objs = [(o, mathutils.Matrix()) for o in context.selected_objects]
 			check = objs
 			while check:
 				children = []
-				for o in check:
+				for o, m in check:
 					for c in o.children:
 						if c.compound:
-							children.append(c)
+							children.append((c, m*c.matrix_local))
 				objs += children
 				check = children
 		elif objs is None:
-			objs = [context.active_object]
+			objs = [(context.active_object, mathutils.Matrix())]
 
 		if not objs:
 			raise Exception("Nothing to export")
-		for o in objs:
+		for o, m in objs:
 			if o.type!="MESH":
 				raise Exception("Can only export Mesh data")
 
@@ -226,32 +226,40 @@ class MeshExporter:
 
 		mesh = None
 		bmeshes = []
-		for o in objs:
+		winding_test = False
+		for o, m in objs:
+			if o.data.winding_test:
+				winding_test = True
+			if o.material_tex:
+				self.material_tex = True
 			bmesh = o.to_mesh(context.scene, True, "PREVIEW")
 			bmeshes.append(bmesh)
+			me = Mesh(bmesh)
+			me.transform(m)
 			if not mesh:
-				mesh = Mesh(bmesh)
+				mesh = me
 			else:
-				mesh.splice(Mesh(bmesh))
+				mesh.splice(me)
 
 		if progress:
 			progress.set_task("Smoothing", 0.05, 0.35)
-		if self.smoothing=="NONE":
+		if mesh.smoothing=="NONE":
 			mesh.flatten_faces()
 		mesh.split_smooth(progress)
 
-		if self.smoothing!="BLENDER":
+		if mesh.smoothing!="BLENDER":
 			mesh.compute_normals()
 
-		if self.export_groups:
-			mesh.sort_vertex_groups(self.max_groups)
+		if mesh.vertex_groups:
+			mesh.sort_vertex_groups(mesh.max_groups_per_vertex)
 
 			# Create a mapping from vertex group indices to bone indices
-			group_index_map = dict((i, i) for i in range(len(objs[0].vertex_groups)))
-			if objs[0].parent and objs[0].parent.type=="ARMATURE":
-				armature = objs[0].parent.data
+			first_obj = objs[0][0]
+			group_index_map = dict((i, i) for i in range(len(first_obj.vertex_groups)))
+			if first_obj.parent and first_obj.parent.type=="ARMATURE":
+				armature = first_obj.parent.data
 				bone_indices = dict((armature.bones[i].name, i) for i in range(len(armature.bones)))
-				for g in objs[0].vertex_groups:
+				for g in first_obj.vertex_groups:
 					if g.name in bone_indices:
 						group_index_map[g.index] = bone_indices[g.name]
 
@@ -260,9 +268,9 @@ class MeshExporter:
 
 		texunits = []
 		force_unit0 = False
-		if mesh.uv_layers and (self.export_uv!="NONE" or self.material_tex):
+		if mesh.uv_layers and (mesh.use_uv!="NONE" or self.material_tex):
 			# Figure out which UV layers to export
-			if self.export_uv=="ALL":
+			if mesh.use_uv=="ALL":
 				texunits = range(len(mesh.uv_layers))
 			elif self.material_tex:
 				# The material UV layer is always the last one
@@ -276,11 +284,11 @@ class MeshExporter:
 			texunits = [(i, mesh.uv_layers[i]) for i in texunits]
 			texunits = [u for u in texunits if not u[1].hidden]
 
-			if self.tbn_vecs:
+			if mesh.tbn_vecs:
 				# TBN coordinates must be generated before vertices are split by any other layer
 				uv_names = [u.name for i, u in texunits]
-				if self.tbn_uvtex in uv_names:
-					tbn_index = uv_names.index(self.tbn_uvtex)
+				if mesh.tbn_uvtex in uv_names:
+					tbn_index = uv_names.index(mesh.tbn_uvtex)
 					unit = texunits[tbn_index]
 					del texunits[tbn_index]
 					texunits.insert(0, unit)
@@ -289,7 +297,7 @@ class MeshExporter:
 				if progress:
 					progress.set_task("Splitting UVs", 0.35+0.3*i/len(texunits), 0.35+0.3*(i+1)/len(texunits))
 				mesh.split_uv(i, progress)
-				if self.tbn_vecs and u.name==self.tbn_uvtex:
+				if mesh.tbn_vecs and u.name==mesh.tbn_uvtex:
 					mesh.compute_uv()
 					mesh.compute_tbn(i)
 
@@ -311,14 +319,15 @@ class MeshExporter:
 		fmt = ["NORMAL3"]
 		if texunits:
 			for i, u in texunits:
+				size = str(len(mesh.vertices[0].uvs[i]))
 				if u.unit==0 or force_unit0:
-					fmt.append("TEXCOORD2")
+					fmt.append("TEXCOORD"+size)
 				else:
-					fmt.append("TEXCOORD2_%d"%u.unit)
-			if self.tbn_vecs:
+					fmt.append("TEXCOORD%s_%d"%(size, u.unit))
+			if mesh.tbn_vecs:
 				fmt += ["TANGENT3", "BINORMAL3"]
-		if self.export_groups:
-			fmt.append("ATTRIB%d_5"%(self.max_groups*2))
+		if mesh.vertex_groups:
+			fmt.append("ATTRIB%d_5"%(mesh.max_groups_per_vertex*2))
 		fmt.append("VERTEX3")
 		out_file.begin("vertices", *fmt)
 		normal = None
@@ -332,21 +341,22 @@ class MeshExporter:
 				normal = v.normal
 			for i, u in texunits:
 				if v.uvs[i]!=uvs.get(i):
+					size = str(len(v.uvs[i]))
 					if u.unit==0 or force_unit0:
-						out_file.write("texcoord2", *v.uvs[i])
+						out_file.write("texcoord"+size, *v.uvs[i])
 					else:
-						out_file.write("multitexcoord2", u.unit, *v.uvs[i])
+						out_file.write("multitexcoord"+size, u.unit, *v.uvs[i])
 					uvs[i] = v.uvs[i]
-			if self.tbn_vecs:
+			if mesh.tbn_vecs:
 				if v.tan!=tan:
 					out_file.write("tangent3", *v.tan)
 					tan = v.tan
 				if v.bino!=bino:
 					out_file.write("binormal3", *v.bino)
 					bino = v.bino
-			if self.export_groups:
-				group_attr = [(group_index_map[g.group], g.weight*v.group_weight_scale) for g in v.groups[:self.max_groups]]
-				while len(group_attr)<self.max_groups:
+			if mesh.vertex_groups:
+				group_attr = [(group_index_map[g.group], g.weight*v.group_weight_scale) for g in v.groups[:mesh.max_groups_per_vertex]]
+				while len(group_attr)<mesh.max_groups_per_vertex:
 					group_attr.append((0, 0.0))
 				group_attr = list(itertools.chain(*group_attr))
 				if group_attr!=group:
@@ -374,12 +384,15 @@ class MeshExporter:
 					out_file.write("indices", f.vertices[0].index, f.vertices[i-1].index, f.vertices[i].index)
 			out_file.end()
 
-		if self.export_lines and mesh.lines:
+		if mesh.use_lines and mesh.lines:
 			out_file.begin("batch", "LINES")
 			for l in mesh.lines:
 				out_file.write("indices", l.vertices[0].index, l.vertices[1].index)
 			out_file.end()
 
+		if winding_test:
+			out_file.write("winding", "COUNTERCLOCKWISE")
+
 		if progress:
 			progress.set_task("Done", 1.0, 1.0)