X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=68d93cbc525b9b3872e209c58a33bb7548ca0cba;hb=e1d07383b29e8581230b50f45606192d1f21f5dd;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..68d93cbc 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)
-		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)
 
-		with open(out_fn, "w") as out_file:
-			for s in resource.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
@@ -49,10 +60,12 @@ class MeshExporter:
 			progress.pop_task()
 
 		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"))
+		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]))
@@ -64,18 +77,24 @@ 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("GROUP{}".format(mesh.max_groups_per_vertex)))
+			st.append(Token("WEIGHT{}".format(mesh.max_groups_per_vertex)))
 		st.append(Token("VERTEX3"))
 
 		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:
@@ -91,13 +110,14 @@ class MeshExporter:
 					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)
@@ -113,19 +133,19 @@ 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)