Refactor creation of batches in the Blender exporter

[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 012386185faa7755388f3aa108e5d02a093446ec..3f5acf9ed35f5cdd8e9c0a32eee6f0faa0dd406b 100644 (file)
--- a/blender/io_mspgl/export_mesh.py
+++ b/blender/io_mspgl/export_mesh.py
@@ -90,22 +90,10 @@ class MeshExporter:
 
                statements.append(st)
 
-               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])))
-                               statements.append(st)
-               else:
-                       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", Token('LINES'))
-                       for l in mesh.lines:
-                               st.sub.append(Statement("indices", *(v.index for v in l.vertices)))
+               for b in mesh.batches:
+                       st = Statement("batch", Token(b.primitive_type))
+                       for i in range(0, len(b.vertices), 32):
+                               st.sub.append(Statement("indices", *(v.index for v in b.vertices[i:i+32])))
                        statements.append(st)
 
                task.set_progress(1.0)