X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=abdd61b062ed6ae72bc2297b1b7d5e3c75d0e3bc;hp=9b36c48ff43faadb0f7ef6da596f37e7806dfd47;hb=be787bc40ba0bb9c7bb622b6172f24b8b8119ec6;hpb=d5c26741ed3952dd54c8a7f43ad42ba79bf2d977

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 9b36c48f..abdd61b0 100644
--- 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"
@@ -109,20 +110,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)