Redesign depth and stencil test and blend state management

[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 0d27a71cdf6c2b1e57121a2e064bec4d5067b9bb..2a8dbe0057062411541507d1faf6fad0509e9812 100644 (file)
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -4,51 +4,6 @@ import bpy
 import mathutils
 
 class MeshExporter:
-       def __init__(self):
-               self.show_progress = True
-               self.use_strips = True
-               self.use_degen_tris = False
-               self.export_all = 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):
-               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)
-               for i, obj in enumerate(objs):
-                       if self.export_all:
-                               out_fn = os.path.join(path, obj.data.name+ext)
-
-                       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
 
@@ -73,19 +28,19 @@ 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("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))
@@ -100,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("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)
 
-               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])))