Refactor scene export to use inline scenes instead of a wrapper scene

[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 0f1d1935601504fd7bbd59b372754579b064482e..1a1bbab062859d794e23361a16cb03d927b40829 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -2,18 +2,12 @@ import math
 import os
 
 class SceneExporter:
-       def __init__(self):
-               self.selected_only = False
-               self.visible_only = True
-               self.collection = True
-               self.skip_existing = True
-
-       def export_to_file(self, context, out_fn):
+       def export_to_file(self, context, out_fn, *, selected_only=False, visible_only=True, collection=True, skip_existing=True):
                from .util import Progress
                progress = Progress(context)
 
                from .scene import create_scene_from_current
-               scene = create_scene_from_current(context, selected_only=self.selected_only, visible_only=self.visible_only)
+               scene = create_scene_from_current(context, selected_only=selected_only, visible_only=visible_only)
 
                resources = {}
                self.export_scene_resources(context, scene, resources, progress)
@@ -23,9 +17,9 @@ class SceneExporter:
                path, base = os.path.split(out_fn)
                base, ext = os.path.splitext(base)
 
-               if self.collection:
+               if collection:
                        existing = None
-                       if self.skip_existing:
+                       if skip_existing:
                                existing = lambda r: not os.path.exists(os.path.join(path, r.name))
                        scene_res.write_collection(out_fn, filter=existing)
                else:
@@ -43,9 +37,26 @@ class SceneExporter:
                from .datafile import Resource, Statement, Token
                scene_res = Resource(scene.name+".scene", "scene")
 
-               scene_res.statements.append(Statement("type", Token(scene.scene_type.lower())))
+               if scene.background_set:
+                       scene_res.statements.append(Statement("type", Token("ordered")))
+                       if scene.background_set:
+                               scene_res.statements.append(scene_res.create_reference_statement("scene", resources[scene.background_set.name+".scene"]))
+
+                       st = Statement("scene")
+                       st.sub.append(Statement("type", Token("simple")))
+                       self.add_instances(scene_res, st.sub, scene.instances, resources)
+                       scene_res.statements.append(st)
+               else:
+                       scene_res.statements.append(Statement("type", Token("simple")))
+
+                       self.add_instances(scene_res, scene_res.statements, scene.instances, resources)
+
+               return scene_res
+
+       def add_instances(self, scene_res, statements, instances, resources):
+               from .datafile import Statement
 
-               for i in scene.instances:
+               for i in instances:
                        obj_res = resources[i.prototype+".object"]
                        st = scene_res.create_reference_statement("object", obj_res, i.name)
 
@@ -65,23 +76,11 @@ class SceneExporter:
                        ss.sub.append(Statement("scale", *tuple(scale)))
 
                        st.sub.append(ss)
-                       scene_res.statements.append(st)
-
-               return scene_res
+                       statements.append(st)
 
        def export_sequence_resources(self, scene, resources):
                from .datafile import Resource, Statement, Token
 
-               if scene.background_set:
-                       wrapper_name = scene.name+".wrapper.scene"
-                       if wrapper_name not in resources:
-                               wrapper_res = Resource(wrapper_name, "scene")
-                               wrapper_res.statements.append(Statement("type", Token("ordered")))
-                               for s in scene.get_chain():
-                                       wrapper_res.statements.append(wrapper_res.create_reference_statement("scene", resources[s.name+".scene"]))
-
-                               resources[wrapper_name] = wrapper_res
-
                lights = []
                s = scene
                while s:
@@ -114,16 +113,15 @@ class SceneExporter:
                if scene.use_hdr:
                        seq_res.statements.append(Statement("hdr", True))
 
-               content = scene
-               if scene.background_set:
-                       content = resources[scene.name+".wrapper.scene"]
-
-               seq_res.statements.append(Statement("clear"))
+               ss = Statement("clear")
+               ss.sub.append(Statement("color", 0.0, 0.0, 0.0, 0.0))
+               ss.sub.append(Statement("depth", 1.0))
+               seq_res.statements.append(ss)
 
                ss = Statement("step", "", "content")
                ss.sub.append(Statement("depth_test", Token("LEQUAL")))
                ss.sub.append(seq_res.create_reference_statement("lighting", resources[scene.name+".lightn"]))
-               ss.sub.append(seq_res.create_reference_statement("scene", content))
+               ss.sub.append(seq_res.create_reference_statement("scene", resources[scene.name+".scene"]))
                seq_res.statements.append(ss)
 
                if scene.use_ao: