X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=45a681c6e888d63e58b615977af599bcc1758987;hb=ffeb9a14765703d3d2e73cec751f5099e0d4c341;hp=7bb32efeeb927ab6c083d0bc387d7ccbf885e358;hpb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py index 7bb32efe..45a681c6 100644 --- 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: @@ -118,7 +112,12 @@ class SceneExporter: if scene.background_set: content = resources[scene.name+".wrapper.scene"] - ss = Statement("pass", "", "content") + 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))