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

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index a6501bc6..68d93cbc 100644
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -64,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]))
@@ -75,18 +77,24 @@ class MeshExporter:
 				st.append(Token("TANGENT3"))
 				st.append(Token("BINORMAL3"))
 		if mesh.vertex_groups:
-			st.append(Token("GENERIC{}_0".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:
@@ -102,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("generic", 0, *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)