Use transform blocks to specify object transforms in exported scenes

[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 3b2147d14d061b64352602aac8bf19a987f2019a..c66feed7aadf9c1218c379a51b94d92fb74e119e 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -39,10 +39,11 @@ class SceneExporter:
 
                        prefix = o.name
                        for c in clones:
-                               for i in range(min(len(c.name), len(prefix))):
-                                       if c.name[i]!=prefix[i]:
-                                               prefix = prefix[:i]
-                                               break
+                               while not c.name.startswith(prefix):
+                                       pos = max(prefix.rfind(' '), prefix.rfind('.'))
+                                       if pos<0:
+                                               break;
+                                       prefix = prefix[:pos]
 
                        if prefix:
                                export_names[o.name+".object"] = prefix.strip(" .")+".object"
@@ -108,9 +109,10 @@ class SceneExporter:
 
                for o in objs:
                        obj_res = resources[prototypes[o.name].name+".object"]
-                       st = scene_res.create_reference_statement("object", obj_res)
+                       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]))
+                       ss = Statement("transform")
+                       ss.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:]
@@ -121,8 +123,9 @@ class SceneExporter:
                                        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", angle*180/math.pi, axis[0], axis[1], axis[2]))
+                       ss.sub.append(Statement("scale", o.scale[0], o.scale[1], o.scale[2]))
+                       st.sub.append(ss)
                        scene_res.statements.append(st)
 
                progress.set_progress(1.0)