Use more compact data types when exporting meshes

[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 16f9514a97402443cadd8bb12d2ce1ca6e2170ee..7bb4e224c58a099ef13a571fc8db5f597f57a764 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
 
@@ -63,22 +18,28 @@ class MeshExporter:
                resource = Resource(mesh.name+".mesh", "mesh")
                statements = resource.statements
 
-               st = Statement("vertices", Token("NORMAL3"))
+               st = Statement("vertices", Token("NORMAL3_BYTE"))
+               if mesh.uv_layers and mesh.tangent_vecs:
+                       st.append(Token("TANGENT3_BYTE"))
                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]))
+                               min_val = min(*u.uvs[0])
+                               max_val = max(*u.uvs[1])
+                               for c in u.uvs:
+                                       min_val = min(min_val, *c)
+                                       max_val = max(max_val, *c)
+                               uv_type = "USHORT" if min_val>=0.0 and max_val<=1.0 else "FLOAT"
                                if u.unit==0:
-                                       st.append(Token("TEXCOORD"+size))
+                                       st.append(Token("TEXCOORD{}_{}".format(size, uv_type)))
                                else:
-                                       st.append(Token("TEXCOORD{}_{}".format(size, u.unit)))
-                       if mesh.tangent_vecs:
-                               st.append(Token("TANGENT3"))
+                                       st.append(Token("TEXCOORD{}_{}_{}".format(size, u.unit, uv_type)))
                if mesh.vertex_groups:
-                       st.append(Token("GROUP{}".format(mesh.max_groups_per_vertex)))
-                       st.append(Token("WEIGHT{}".format(mesh.max_groups_per_vertex)))
-               st.append(Token("VERTEX3"))
+                       st.append(Token("GROUP{}_UBYTE".format(mesh.max_groups_per_vertex)))
+                       st.append(Token("WEIGHT{}_USHORT".format(mesh.max_groups_per_vertex)))
+               st.append(Token("VERTEX3_FLOAT"))
 
                normal = None
                color = None
@@ -117,12 +78,8 @@ class MeshExporter:
 
                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])))