Sort things by name when exporting

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

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 245d2d3efeef77db689367a2667e7eb16e341d1d..ac812abf7b115766ab0c08af3848614a4ff99ab4 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -3,12 +3,23 @@ import os
 
 class SceneExporter:
        def __init__(self):
+               self.selected_only = False
+               self.active_layers = True
                self.resource_collection = True
+               self.skip_existing = True
                self.show_progress = True
 
        def export_to_file(self, context, out_fn):
-               objs = [o for o in context.selected_objects if o.type=="MESH" and not o.lod_for_parent]
+               if self.selected_only:
+                       objs = context.selected_objects
+               else:
+                       objs = context.scene.objects
+               if self.active_layers:
+                       layers = context.scene.layers
+                       objs = [o for o in objs if any(a and b for a, b in zip(layers, o.layers))]
+               objs = [o for o in objs if o.type=="MESH" and not o.lod_for_parent]
                objs = [o for o in objs if (not o.compound or o.parent not in objs)]
+               objs.sort(key=lambda x:x.name)
 
                path, base = os.path.split(out_fn)
                base, ext = os.path.splitext(base)
@@ -30,8 +41,6 @@ class SceneExporter:
                                                continue
                                        if u.data.name!=o.data.name:
                                                continue
-                                       if u.technique!=o.technique:
-                                               continue
                                        if any(s.link=="OBJECT" for s in u.material_slots):
                                                continue
 
@@ -64,8 +73,8 @@ class SceneExporter:
                scene_res = self.export_scene(context, objs, progress, prototypes=object_prototypes, resources=resources)
                refs = scene_res.collect_references()
 
-               from .datafile import Statement
                if self.resource_collection:
+                       from .datafile import Statement
                        keywords = { ".mat": "material",
                                ".mesh": "mesh",
                                ".object": "object",
@@ -73,6 +82,9 @@ class SceneExporter:
                                ".tex2d": "texture2d" }
                        with open(os.path.join(path, base+"_resources.mdc"), "w") as res_out:
                                for r in refs:
+                                       if self.skip_existing and os.path.exists(os.path.join(path, r.name)):
+                                               continue
+
                                        st = Statement(keywords[os.path.splitext(r.name)[1]], r.name)
                                        st.sub = r.statements
                                        st.write_to_file(res_out)
@@ -110,20 +122,23 @@ class SceneExporter:
                for o in objs:
                        obj_res = resources[prototypes[o.name].name+".object"]
                        st = scene_res.create_reference_statement("object", obj_res, o.name)
-                       # XXX Parent relationships screw up the location and rotation
-                       st.sub.append(Statement("position", o.location[0], o.location[1], o.location[2]))
-                       if o.rotation_mode=="AXIS_ANGLE":
-                               angle = o.rotation_axis_angle[0]
-                               axis = o.rotation_axis_angle[1:]
+
+                       ss = Statement("transform")
+
+                       loc = o.matrix_world.to_translation()
+                       ss.sub.append(Statement("position", *tuple(loc)))
+
+                       quat = o.matrix_world.to_quaternion()
+                       if o.rotation_mode in ('XYZ', 'XZY', 'YXZ', 'YZX', 'ZXY', 'ZYX'):
+                               angles = [a*180/math.pi for a in quat.to_euler()]
+                               ss.sub.append(Statement("euler", *angles));
                        else:
-                               if o.rotation_mode=="QUATERNION":
-                                       q = o.rotation_quaternion
-                               else:
-                                       q = o.rotation_euler.to_quaternion()
-                               angle = q.angle
-                               axis = q.axis
-                       st.sub.append(Statement("rotation", angle*180/math.pi, axis[0], axis[1], axis[2]))
-                       st.sub.append(Statement("scale", o.scale[0], o.scale[1], o.scale[2]))
+                               ss.sub.append(Statement("rotation", quat.angle*180/math.pi, *tuple(quat.axis)))
+
+                       scale = o.matrix_world.to_scale()
+                       ss.sub.append(Statement("scale", *tuple(scale)))
+
+                       st.sub.append(ss)
                        scene_res.statements.append(st)
 
                progress.set_progress(1.0)