X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=7bb32efeeb927ab6c083d0bc387d7ccbf885e358;hp=63ca1f38ec2717f61c403c363677f89f5ff151c2;hb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;hpb=03d2f0d7f4673b5262f396fda430e766eec4549b

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index 63ca1f38..7bb32efe 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -7,11 +7,10 @@ class SceneExporter:
 		self.visible_only = True
 		self.collection = True
 		self.skip_existing = True
-		self.show_progress = True
 
 	def export_to_file(self, context, out_fn):
 		from .util import Progress
-		progress = Progress(self.show_progress and context)
+		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)
@@ -69,3 +68,79 @@ class SceneExporter:
 			scene_res.statements.append(st)
 
 		return scene_res
+
+	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:
+			lights += s.lights
+			s = s.background_set
+
+		from .util import make_unique
+		lights = make_unique(lights)
+
+		from .export_light import LightExporter
+		light_exporter = LightExporter()
+		for l in lights:
+			light_name = l.name+".light"
+			if light_name not in resources:
+				resources[light_name] = light_exporter.export_light(l)
+
+		lighting_name = scene.name+".lightn"
+		if lighting_name not in resources:
+			lighting_res = Resource(lighting_name, "lighting")
+			lighting_res.statements.append(Statement("ambient", *tuple(scene.ambient_light)))
+			for l in lights:
+				lighting_res.statements.append(lighting_res.create_reference_statement("light", resources[l.name+".light"]))
+
+			resources[lighting_name] = lighting_res
+
+	def export_sequence(self, scene, resources):
+		from .datafile import Resource, Statement, Token
+		seq_res = Resource(scene.name+".seq", "sequence")
+
+		if scene.use_hdr:
+			seq_res.statements.append(Statement("hdr", True))
+
+		content = scene
+		if scene.background_set:
+			content = resources[scene.name+".wrapper.scene"]
+
+		ss = Statement("pass", "", "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))
+		seq_res.statements.append(ss)
+
+		if scene.use_ao:
+			ss = Statement("ambient_occlusion")
+			ss.sub.append(Statement("occlusion_radius", scene.ao_distance))
+			ss.sub.append(Statement("samples", scene.ao_samples))
+			seq_res.statements.append(ss)
+
+		if scene.use_hdr:
+			seq_res.statements.append(Statement("bloom"))
+			ss = Statement("colorcurve")
+			ss.sub.append(Statement("exposure_adjust", scene.exposure))
+			ss.sub.append(Statement("srgb"))
+			seq_res.statements.append(ss)
+		else:
+			# Add a colorcurve with linear response to convert into sRGB color space
+			ss = Statement("colorcurve")
+			ss.sub.append(Statement("brightness_response", 1.0))
+			ss.sub.append(Statement("srgb"))
+			seq_res.statements.append(ss)
+
+		return seq_res