X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=68b589879c4fdc2722f41157bfe018590d0122f9;hp=c66feed7aadf9c1218c379a51b94d92fb74e119e;hb=7dd9bd52860aff5372a2526cf689d3a19ea37fe0;hpb=94d95c02822b2cff8e5d8254fed7b3058584acf7

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index c66feed7..68b58987 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -30,8 +30,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 +62,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",
@@ -110,21 +108,22 @@ 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
+
 			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:]
+
+			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
-			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]))
+				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)