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

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index 2a8dbe00..b0f186db 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -1,39 +1,57 @@
-import itertools
-import os
-import bpy
-import mathutils
-
 class MeshExporter:
-	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", "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.tangent_vecs:
-				st.append(Token("TANGENT3"))
+					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("GROUP{}".format(mesh.max_groups_per_vertex)))
-			st.append(Token("WEIGHT{}".format(mesh.max_groups_per_vertex)))
-		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
@@ -72,27 +90,14 @@ class MeshExporter:
 
 		statements.append(st)
 
-		if mesh.use_strips:
-			for s in mesh.vertex_sequence:
-				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", Token('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", Token('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", Token('COUNTERCLOCKWISE')))
-
-		progress.set_progress(1.0)
+		task.set_progress(1.0)
 
 		return resource