Further refactoring of instance handling in the Blender exporter

[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 e7759e9c4c8a775e6aff2f9879fb6c6d30eacb98..a42d8180c1d3bc0255285935617787c6a4b74a78 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -33,7 +33,7 @@ class SceneExporter:
                from .export import DataExporter
                data_exporter = DataExporter()
 
-               data_exporter.export_resources(ctx, scene.prototypes, resources)
+               data_exporter.export_resources(ctx, [p.object for p in scene.prototypes], resources)
 
        def export_scene(self, scene, resources):
                from .datafile import Resource, Statement, Token
@@ -73,23 +73,28 @@ class SceneExporter:
                        if i.name:
                                st.append(i.name)
 
-                       ss = Statement("transform")
+                       st.sub.append(self.create_transform_statement(i))
+                       statements.append(st)
 
-                       loc = i.matrix_world.to_translation()
-                       ss.sub.append(Statement("position", *tuple(loc)))
+       def create_transform_statement(self, instance):
+               from .datafile import Statement
 
-                       quat = i.matrix_world.to_quaternion()
-                       if i.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:
-                               ss.sub.append(Statement("rotation", quat.angle*180/math.pi, *tuple(quat.axis)))
+               st = Statement("transform")
 
-                       scale = i.matrix_world.to_scale()
-                       ss.sub.append(Statement("scale", *tuple(scale)))
+               loc = instance.matrix_world.to_translation()
+               st.sub.append(Statement("position", *tuple(loc)))
 
-                       st.sub.append(ss)
-                       statements.append(st)
+               quat = instance.matrix_world.to_quaternion()
+               if instance.rotation_mode in ('XYZ', 'XZY', 'YXZ', 'YZX', 'ZXY', 'ZYX'):
+                       angles = [a*180/math.pi for a in quat.to_euler()]
+                       st.sub.append(Statement("euler", *angles));
+               else:
+                       st.sub.append(Statement("rotation", quat.angle*180/math.pi, *tuple(quat.axis)))
+
+               scale = instance.matrix_world.to_scale()
+               st.sub.append(Statement("scale", *tuple(scale)))
+
+               return st
 
        def export_sequence_resources(self, scene, resources):
                from .datafile import Resource, Statement, Token
@@ -151,8 +156,8 @@ class SceneExporter:
                                use_shadow = True
                        shadowed_lights += [l.data for l in s.lights if l.data.use_shadow]
                        for i in itertools.chain(s.instances, s.blended_instances):
-                               p = i.prototype
-                               if p.material_slots and p.material_slots[0].material and p.material_slots[0].material.shadow_method!='NONE':
+                               o = i.prototype.object
+                               if o.material_slots and o.material_slots[0].material and o.material_slots[0].material.shadow_method!='NONE':
                                        shadow_casters.append(i)
                        s = s.background_set
 
@@ -290,7 +295,7 @@ class SceneExporter:
        def compute_bounding_sphere(self, instances):
                points = []
                for i in instances:
-                       points += [i.matrix_world@mathutils.Vector(c) for c in i.prototype.bound_box]
+                       points += [i.matrix_world@mathutils.Vector(c) for c in i.prototype.object.bound_box]
 
                from .util import compute_bounding_sphere
                return compute_bounding_sphere(points)