X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=a6501bc64bdfd4e58350c65e24f3803a7b6766a6;hb=68b74ce23dd20822b07d79dc25aa0a0a19ef27a5;hp=bb116bda9133f3f8192e5ebfa0f42bc10ad046f1;hpb=6ee541fd39de1e1368134cb8a98a14f2f5ddd767;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index bb116bda..a6501bc6 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -1,4 +1,5 @@
 import itertools
+import os
 import bpy
 import mathutils
 
@@ -7,6 +8,7 @@ class MeshExporter:
 		self.show_progress = True
 		self.use_strips = True
 		self.use_degen_tris = False
+		self.export_all = False
 
 	def join_strips(self, strips):
 		big_strip = []
@@ -26,17 +28,26 @@ class MeshExporter:
 		return big_strip
 
 	def export_to_file(self, context, out_fn):
-		obj = context.active_object
+		if self.export_all:
+			objs = [o for o in context.selected_objects if o.type=="MESH"]
+		else:
+			objs = [context.active_object]
 
 		from .util import Progress
 
+		path, base = os.path.split(out_fn)
+		base, ext = os.path.splitext(base)
+
 		progress = Progress(self.show_progress and context)
-		progress.push_task("", 0.0, 0.95)
-		statements = self.export_mesh(context, obj, progress)
+		for i, obj in enumerate(objs):
+			if self.export_all:
+				out_fn = os.path.join(path, obj.data.name+ext)
 
-		with open(out_fn, "w") as out_file:
-			for s in statements:
-				s.write_to_file(out_file)
+			progress.push_task_slice(obj.data.name, i, len(objs))
+			resource = self.export_mesh(context, obj, progress)
+
+			resource.write_to_file(out_fn)
+			progress.pop_task()
 
 	def export_mesh(self, context, mesh_or_obj, progress):
 		from .mesh import Mesh, create_mesh_from_object
@@ -48,9 +59,9 @@ class MeshExporter:
 			mesh = create_mesh_from_object(context, mesh_or_obj, progress)
 			progress.pop_task()
 
-		from .datafile import Statement, Token
-
-		statements = []
+		from .datafile import Resource, Statement, Token
+		resource = Resource(mesh.name+".mesh", "mesh")
+		statements = resource.statements
 
 		st = Statement("vertices", Token("NORMAL3"))
 		if mesh.uv_layers:
@@ -64,7 +75,7 @@ class MeshExporter:
 				st.append(Token("TANGENT3"))
 				st.append(Token("BINORMAL3"))
 		if mesh.vertex_groups:
-			st.append(Token("ATTRIB{}_5".format(mesh.max_groups_per_vertex*2)))
+			st.append(Token("GENERIC{}_0".format(mesh.max_groups_per_vertex*2)))
 		st.append(Token("VERTEX3"))
 
 		normal = None
@@ -96,7 +107,7 @@ class MeshExporter:
 					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))
+					st.sub.append(Statement("generic", 0, *group_attr))
 					group = group_attr
 			st.sub.append(Statement("vertex", *v.co))
 
@@ -113,20 +124,20 @@ class MeshExporter:
 					st.sub.append(Statement("indices", *(v.index for v in s[i:i+32])))
 				statements.append(st)
 		else:
-			st = Statement("batch", "TRIANGLES")
+			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", "LINES")
+			st = Statement("batch", Token('LINES'))
 			for l in mesh.lines:
 				st.sub.append(Statement("indices", *(v.index for v in l.vertices)))
 			statements.append(st)
 
 		if mesh.winding_test:
-			statements.append(Statement("winding", "COUNTERCLOCKWISE"))
+			statements.append(Statement("winding", Token('COUNTERCLOCKWISE')))
 
 		progress.set_progress(1.0)
 
-		return statements
+		return resource