Improve smoothing in blender exporter

[libs/gl.git] / blender / io_mesh_mspgl / export_mspgl.py

diff --git a/blender/io_mesh_mspgl/export_mspgl.py b/blender/io_mesh_mspgl/export_mspgl.py
index 6de38f8722935d884f45c4fbc441bca1e28926f7..e2082cb8d04770b1b4c510eaca90c4797114afcc 100644 (file)
--- a/blender/io_mesh_mspgl/export_mspgl.py
+++ b/blender/io_mesh_mspgl/export_mspgl.py
@@ -71,10 +71,13 @@ class Exporter:
                self.optimize_cache = False
                self.cache_size = 64
                self.export_lines = True
+               self.export_uv = "UNIT0"
                self.tbn_vecs = False
+               self.tbn_uvtex = ""
                self.compound = False
                self.object = False
                self.material_tex = False
+               self.smoothing = "MSPGL"
 
        def stripify(self, mesh, progress = None):
                for f in mesh.faces:
@@ -236,20 +239,30 @@ class Exporter:
                                mesh.splice(Mesh(bmesh))
 
                progress.set_task("Smoothing", 0.05, 0.35)
-               mesh.split_smooth()
+               if self.smoothing=="NONE":
+                       mesh.flatten_faces()
+               mesh.split_smooth(progress)
 
-               mesh.compute_normals()
+               if self.smoothing!="BLENDER":
+                       mesh.compute_normals()
 
                if self.material_tex:
                        mesh.generate_material_uv()
 
-               if mesh.has_uv:
-                       progress.set_task("Splitting UVs", 0.35, 0.65)
-                       mesh.split_uv()
+               texunits = []
+               if mesh.uv_textures and self.export_uv!="NONE":
+                       if self.export_uv=="UNIT0":
+                               texunits = [0]
+                       else:
+                               texunits = list(range(len(mesh.uv_textures)))
+
+                       for i in texunits:
+                               progress.set_task("Splitting UVs", 0.35+0.3*i/len(texunits), 0.35+0.3*(i+1)/len(texunits))
+                               mesh.split_uv(i, progress)
 
                        mesh.compute_uv()
                        if self.tbn_vecs:
-                               mesh.compute_tbn()
+                               mesh.compute_tbn(self.tbn_uvtex)
 
                strips = []
                loose = mesh.faces
@@ -264,23 +277,29 @@ class Exporter:
                        out_file.begin("mesh")
 
                fmt = "NORMAL3"
-               if mesh.has_uv:
+               if texunits:
                        fmt += "_TEXCOORD2"
+                       for i in texunits[1:]:
+                               fmt += "_TEXCOORD2%d"%i
                        if self.tbn_vecs:
                                fmt += "_ATTRIB33_ATTRIB34"
                fmt += "_VERTEX3"
                out_file.begin("vertices", fmt)
                normal = None
-               uv = None
+               uvs = [None]*len(mesh.uv_textures)
                tan = None
                bino = None
                for v in mesh.vertices:
                        if v.normal!=normal:
                                out_file.write("normal3", *v.normal)
                                normal = v.normal
-                       if v.uv!=uv:
-                               out_file.write("texcoord2", *v.uv)
-                               uv = v.uv
+                       for i in texunits:
+                               if v.uvs[i]!=uvs[i]:
+                                       if i==0:
+                                               out_file.write("texcoord2", *v.uvs[i])
+                                       else:
+                                               out_file.write("multitexcoord2", i, *v.uvs[i])
+                                       uvs[i] = v.uvs[i]
                        if v.tan!=tan:
                                out_file.write("attrib3", 3, *v.tan)
                                tan = v.tan