X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=e620b86f22ab9f0ebe155eb8ed50d3bcd9615789;hb=HEAD;hp=7b8fd771cd0ceab2c926a1be0db9cc3207745ab1;hpb=907a2aced4b7d70af6be0625632ba373c458f197;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index 7b8fd771..b0f186db 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -1,81 +1,71 @@
-import itertools
-import bpy
-import mathutils
-
 class MeshExporter:
-	def __init__(self):
-		self.show_progress = True
-		self.use_strips = True
-		self.use_degen_tris = False
-
-	def join_strips(self, strips):
-		big_strip = []
-
-		for s in strips:
-			if big_strip:
-				# Generate glue elements, ensuring that the next strip begins at
-				# an even position
-				glue = [big_strip[-1], s[0]]
-				if len(big_strip)%2:
-					glue += [s[0]]
-
-				big_strip += glue
-
-			big_strip += s
-
-		return big_strip
-
-	def export_to_file(self, context, out_fn):
-		obj = context.active_object
-
-		from .util import Progress
-
-		progress = Progress(self.show_progress and context)
-		progress.push_task("", 0.0, 0.95)
-		resource = self.export_mesh(context, obj, progress)
-
-		with open(out_fn, "w") as out_file:
-			for s in resource.statements:
-				s.write_to_file(out_file)
-
-	def export_mesh(self, context, mesh_or_obj, progress):
+	def export_mesh(self, ctx, mesh_or_obj):
 		from .mesh import Mesh, create_mesh_from_object
 
 		if type(mesh_or_obj)==Mesh:
 			mesh = mesh_or_obj
 		else:
-			progress.push_task("", 0.0, 0.9)
-			mesh = create_mesh_from_object(context, mesh_or_obj, progress)
-			progress.pop_task()
+			task = ctx.task("Preparing mesh", 0.9)
+			mesh = create_mesh_from_object(task, mesh_or_obj)
 
 		from .datafile import Resource, Statement, Token
-		resource = Resource(mesh.name+".mesh")
+		resource = Resource(mesh.name+".mesh", "mesh")
 		statements = resource.statements
 
-		st = Statement("vertices", Token("NORMAL3"))
+		task = ctx.task("Creating statements", 1.0)
+
+		statements.append(Statement("winding", Token('COUNTERCLOCKWISE')))
+
+		st = Statement("vertices", Token("VERTEX3_FLOAT"))
+		stride = 12
+		if mesh.vertices[0].color:
+			st.append(Token("COLOR4_UBYTE"))
+			stride += 4
 		if mesh.uv_layers:
 			for u in mesh.uv_layers:
-				size = str(len(u.uvs[0]))
+				size = len(u.uvs[0])
+				min_val = min(*u.uvs[0])
+				max_val = max(*u.uvs[1])
+				for c in u.uvs:
+					min_val = min(min_val, *c)
+					max_val = max(max_val, *c)
+				uv_type = "USHORT" if min_val>=0.0 and max_val<=1.0 else "FLOAT"
+				if uv_type=="FLOAT" and stride%4:
+					pad = 4-stride%4
+					st.append(Token("PADDING{}".format(pad)))
+					stride += pad
 				if u.unit==0:
-					st.append(Token("TEXCOORD"+size))
+					st.append(Token("TEXCOORD{}_{}".format(size, uv_type)))
 				else:
-					st.append(Token("TEXCOORD{}_{}".format(size, u.unit)))
-			if mesh.tbn_vecs:
-				st.append(Token("TANGENT3"))
-				st.append(Token("BINORMAL3"))
+					st.append(Token("TEXCOORD{}_{}_{}".format(size, u.unit, uv_type)))
+				stride += (2 if uv_type=="USHORT" else 4)*size
 		if mesh.vertex_groups:
-			st.append(Token("ATTRIB{}_5".format(mesh.max_groups_per_vertex*2)))
-		st.append(Token("VERTEX3"))
+			st.append(Token("WEIGHT{}_USHORT".format(mesh.max_groups_per_vertex)))
+			st.append(Token("GROUP{}_UBYTE".format(mesh.max_groups_per_vertex)))
+			stride += 3*mesh.max_groups_per_vertex
+		st.append(Token("NORMAL3_BYTE"))
+		stride += 3
+		if mesh.uv_layers and mesh.tangent_vecs:
+			st.append(Token("TANGENT3_BYTE"))
+			stride += 3
+		if stride%4:
+			pad = 4-stride%4
+			st.append(Token("PADDING{}_UBYTE".format(pad)))
+			stride += pad
 
 		normal = None
+		color = None
 		uvs = [None]*len(mesh.uv_layers)
 		tan = None
-		bino = None
 		group = None
+		weight = None
 		for v in mesh.vertices:
 			if v.normal!=normal:
 				st.sub.append(Statement("normal", *v.normal))
 				normal = v.normal
+			if v.color!=color:
+				st.sub.append(Statement("color", *v.color))
+				color = v.color
 			for i, u in enumerate(mesh.uv_layers):
 				if v.uvs[i]!=uvs[i]:
 					if u.unit==0:
@@ -83,50 +73,31 @@ class MeshExporter:
 					else:
 						st.sub.append(Statement("multitexcoord", u.unit, *v.uvs[i]))
 					uvs[i] = v.uvs[i]
-			if mesh.tbn_vecs:
+			if mesh.tangent_vecs:
 				if v.tan!=tan:
 					st.sub.append(Statement("tangent", *v.tan))
 					tan = v.tan
-				if v.bino!=bino:
-					st.sub.append(Statement("binormal", *v.bino))
-					bino = v.bino
 			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:
-					st.sub.append(Statement("attrib", 5, *group_attr))
-					group = group_attr
+				v_group = [g.group for g in v.groups]
+				v_weight = [g.weight for g in v.groups]
+				if v_group!=group:
+					st.sub.append(Statement("group", *v_group))
+					group = v_group
+				if v_weight!=weight:
+					st.sub.append(Statement("weight", *v_weight))
+					weight = v_weight
 			st.sub.append(Statement("vertex", *v.co))
 
 		statements.append(st)
 
-		if self.use_strips:
-			strips = mesh.vertex_sequence
-			if self.use_degen_tris:
-				strips = [self.join_strips(strips)]
-
-			for s in strips:
-				st = Statement("batch", Token("TRIANGLE_STRIP"))
-				for i in range(0, len(s), 32):
-					st.sub.append(Statement("indices", *(v.index for v in s[i:i+32])))
-				statements.append(st)
-		else:
-			st = Statement("batch", "TRIANGLES")
-			for f in mesh.faces:
-				st.sub.append(Statement("indices", *(v.index for v in f.vertices)))
-			statements.append(st)
-
-		if mesh.lines:
-			st = Statement("batch", "LINES")
-			for l in mesh.lines:
-				st.sub.append(Statement("indices", *(v.index for v in l.vertices)))
+		for b in mesh.batches:
+			st = Statement("batch", Token(b.primitive_type))
+			if b.primitive_type=="PATCHES":
+				st.sub.append(Statement("patch_size", b.patch_size))
+			for i in range(0, len(b.vertices), 32):
+				st.sub.append(Statement("indices", *(v.index for v in b.vertices[i:i+32])))
 			statements.append(st)
 
-		if mesh.winding_test:
-			statements.append(Statement("winding", "COUNTERCLOCKWISE"))
-
-		progress.set_progress(1.0)
+		task.set_progress(1.0)
 
 		return resource