Redesign object exporting

[libs/gl.git] / blender / io_mspgl / export_mesh.py

diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py
index e620b86f22ab9f0ebe155eb8ed50d3bcd9615789..2a8dbe0057062411541507d1faf6fad0509e9812 100644 (file)
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -1,43 +1,9 @@
 import itertools
+import os
 import bpy
 import mathutils
 
 class MeshExporter:
-       def __init__(self):
-               self.show_progress = True
-               self.use_strips = True
-               self.use_degen_tris = False
-
-       def join_strips(self, strips):
-               big_strip = []
-
-               for s in strips:
-                       if big_strip:
-                               # Generate glue elements, ensuring that the next strip begins at
-                               # an even position
-                               glue = [big_strip[-1], s[0]]
-                               if len(big_strip)%2:
-                                       glue += [s[0]]
-
-                               big_strip += glue
-
-                       big_strip += s
-
-               return big_strip
-
-       def export_to_file(self, context, out_fn):
-               obj = context.active_object
-
-               from .util import Progress
-
-               progress = Progress(self.show_progress and context)
-               progress.push_task("", 0.0, 0.95)
-               resource = self.export_mesh(context, obj, progress)
-
-               with open(out_fn, "w") as out_file:
-                       for s in resource.statements:
-                               s.write_to_file(out_file)
-
        def export_mesh(self, context, mesh_or_obj, progress):
                from .mesh import Mesh, create_mesh_from_object
 
@@ -49,10 +15,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]))
@@ -60,22 +28,26 @@ class MeshExporter:
                                        st.append(Token("TEXCOORD"+size))
                                else:
                                        st.append(Token("TEXCOORD{}_{}".format(size, u.unit)))
-                       if mesh.tbn_vecs:
+                       if mesh.tangent_vecs:
                                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:
@@ -83,31 +55,25 @@ class MeshExporter:
                                        else:
                                                st.sub.append(Statement("multitexcoord", u.unit, *v.uvs[i]))
                                        uvs[i] = v.uvs[i]
-                       if mesh.tbn_vecs:
+                       if mesh.tangent_vecs:
                                if v.tan!=tan:
                                        st.sub.append(Statement("tangent", *v.tan))
                                        tan = v.tan
-                               if v.bino!=bino:
-                                       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)
 
-               if self.use_strips:
-                       strips = mesh.vertex_sequence
-                       if self.use_degen_tris:
-                               strips = [self.join_strips(strips)]
-
-                       for s in strips:
+               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])))