X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=0d27a71cdf6c2b1e57121a2e064bec4d5067b9bb;hb=f398c65c9e741ca4919a0770e096c15e8d33c1c2;hp=0bf7b83af6fb6be4581f0dcfcbebd04674ddc17b;hpb=42ae18b7a9dc13a72bf421e564f02829d4bdd5be;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index 0bf7b83a..0d27a71c 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,15 +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)
-		resource = 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)
 
-		resource.write_to_file(out_fn)
+			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
@@ -51,6 +64,8 @@ class MeshExporter:
 		statements = resource.statements
 
 		st = Statement("vertices", Token("NORMAL3"))
+		if mesh.vertices[0].color:
+			st.append(Token("COLOR4_UBYTE"))
 		if mesh.uv_layers:
 			for u in mesh.uv_layers:
 				size = str(len(u.uvs[0]))
@@ -62,10 +77,11 @@ 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
+		color = None
 		uvs = [None]*len(mesh.uv_layers)
 		tan = None
 		bino = None
@@ -74,6 +90,9 @@ class MeshExporter:
 			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:
@@ -94,7 +113,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))