X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=blender%2Fio_mspgl%2Fscene.py;h=53d338cb88b05ec625e6f5b044ae99d59df19019;hb=7ae4af7;hp=079647ce00985a41252084cdfd6a3ca435b06626;hpb=3b0cb993f410b05fc6309d41aa292f4e57c35519;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/scene.py b/blender/io_mspgl/scene.py
index 079647ce..53d338cb 100644
--- a/blender/io_mspgl/scene.py
+++ b/blender/io_mspgl/scene.py
@@ -17,10 +17,14 @@ class Scene:
 	def __init__(self, scene, obj_filter=None):
 		self.name = scene.name
 		self.scene_type = scene.scene_type
+		self.export_disposition = scene.export_disposition
+		self.background_set = None
+		self.camera = scene.camera
 		self.prototypes = []
 		self.instances = []
+		self.lights = []
 
-		objects = [o for o in scene.objects if o.type=='MESH']
+		objects = scene.objects[:]
 		objects.sort(key=lambda o:o.name)
 		if obj_filter:
 			objects = list(filter(obj_filter, objects))
@@ -30,11 +34,21 @@ class Scene:
 			if o.name in processed:
 				continue
 
-			clones = [c for c in objects if is_same_object(o, c)]
-			self.prototypes.append(o)
-			for c in clones:
-				self.instances.append(Instance(c, o))
-				processed.add(c.name)
+			if o.type=='MESH':
+				clones = [c for c in objects if is_same_object(o, c)]
+				self.prototypes.append(o)
+				for c in clones:
+					self.instances.append(Instance(c, o))
+					processed.add(c.name)
+			elif o.type=='LIGHT':
+				self.lights.append(o)
+
+	def get_chain(self):
+		result = []
+		if self.background_set:
+			result = self.background_set.get_chain()
+		result.append(self)
+		return result
 
 def get_all_collections(collection):
 	result = [collection]
@@ -62,3 +76,39 @@ def create_scene_from_current(context, *, selected_only=False, visible_only=True
 		obj_filter = lambda o: all(f(o) for f in obj_filters)
 
 	return Scene(context.scene, obj_filter)
+
+def create_scene(scene, *, visible_only=True):
+	obj_filter = None
+
+	if visible_only:
+		visible_names = set()
+		for c in get_all_collections(scene.collection):
+			if not c.hide_viewport:
+				visible_names.update(o.name for o in c.objects)
+		obj_filter = lambda o: o.name in visible_names
+
+	return Scene(scene, obj_filter)
+
+def create_scene_chain(scene, cache, *, visible_only=True):
+	if cache is None:
+		cache = {}
+
+	top = None
+	prev = None
+	while scene:
+		converted = None
+		if scene.name in cache:
+			converted = cache[scene.name]
+		else:
+			converted = create_scene(scene, visible_only=visible_only)
+			cache[scene.name] = converted
+
+		if not top:
+			top = converted
+		if prev:
+			prev.background_set = converted
+
+		prev = converted
+		scene = scene.background_set
+
+	return top