X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=2ec85ccbddbdef3ed708ddae330d5b713fb98bea;hb=8fe8ab4d4a92520e24a248042c187a8d9778be1f;hp=b28c8e041db4c66d2d43b1dc59d95c1c77e76797;hpb=d3813a0ab6ee2f8b9af775c28b51b512abe6cd09;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index b28c8e04..2ec85ccb 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -4,8 +4,9 @@ import os
 class SceneExporter:
 	def __init__(self):
 		self.selected_only = False
-		self.active_layers = True
+		self.visible_collections = True
 		self.resource_collection = True
+		self.skip_existing = True
 		self.show_progress = True
 
 	def export_to_file(self, context, out_fn):
@@ -13,11 +14,12 @@ class SceneExporter:
 			objs = context.selected_objects
 		else:
 			objs = context.scene.objects
-		if self.active_layers:
-			layers = context.scene.layers
-			objs = [o for o in objs if any(a and b for a, b in zip(layers, o.layers))]
+		if self.visible_collections:
+			collections = [c.collection for c in context.view_layer.layer_collection.children if not (c.hide_viewport or c.collection.hide_viewport)]
+			objs = [o for o in objs if any((o.name in c.all_objects) for c in collections)]
 		objs = [o for o in objs if o.type=="MESH" and not o.lod_for_parent]
 		objs = [o for o in objs if (not o.compound or o.parent not in objs)]
+		objs.sort(key=lambda x:x.name)
 
 		path, base = os.path.split(out_fn)
 		base, ext = os.path.splitext(base)
@@ -28,21 +30,21 @@ class SceneExporter:
 		object_prototypes = {}
 		unique_objects = []
 		export_names = {}
+		used_names = set()
 		for o in objs:
 			if o.name in object_prototypes:
 				continue
 
 			clones = [o]
-			if not any(s.link=="OBJECT" for s in o.material_slots):
-				for u in objs:
-					if u is o:
-						continue
-					if u.data.name!=o.data.name:
-						continue
-					if any(s.link=="OBJECT" for s in u.material_slots):
-						continue
+			for u in objs:
+				if u is o:
+					continue
+				if u.data.name!=o.data.name:
+					continue
+				if any(m1.name!=m2.name for m1, m2 in zip(o.material_slots, u.material_slots)):
+					continue
 
-					clones.append(u)
+				clones.append(u)
 
 			prefix = o.name
 			for c in clones:
@@ -53,12 +55,23 @@ class SceneExporter:
 					prefix = prefix[:pos]
 
 			if prefix:
-				export_names[o.name+".object"] = prefix.strip(" .")+".object"
+				export_names[o.name+".object"] = prefix.strip(" .")
+			else:
+				used_names.add(o.name)
 
 			unique_objects.append(o)
 			for c in clones:
 				object_prototypes[c.name] = o
 
+		for n, e in export_names.items():
+			if e in used_names:
+				number = 1
+				while "{}_{}".format(e, number) in used_names:
+					number += 1
+				e += "_{}".format(number)
+			export_names[n] = e+".object"
+			used_names.add(e)
+
 		from .util import Progress
 		progress = Progress(self.show_progress and context)
 
@@ -72,47 +85,36 @@ class SceneExporter:
 		refs = scene_res.collect_references()
 
 		if self.resource_collection:
-			from .datafile import Statement
-			keywords = { ".mat": "material",
-				".mesh": "mesh",
-				".object": "object",
-				".tech": "technique",
-				".tex2d": "texture2d" }
-			with open(os.path.join(path, base+"_resources.mdc"), "w") as res_out:
-				for r in refs:
-					st = Statement(keywords[os.path.splitext(r.name)[1]], r.name)
-					st.sub = r.statements
-					st.write_to_file(res_out)
+			filter = None
+			if self.skip_existing:
+				filter = lambda r: not os.path.exists(os.path.join(path, r.name))
+			scene_res.write_collection(os.path.join(path, base+"_resources.mdc"), exclude_self=True, filter=filter)
 		else:
 			res_dir = os.path.join(path, base+"_resources")
 			if not os.path.exists(res_dir):
 				os.makedirs(res_dir)
 			for r in refs:
-				with open(os.path.join(res_dir, r.name), "w") as res_out:
-					for s in r.statements:
-						s.write_to_file(res_out)
+				r.write_to_file(os.path.join(res_dir, r.name))
 
-		with open(out_fn, "w") as out_file:
-			for s in scene_res.statements:
-				s.write_to_file(out_file)
+		scene_res.write_to_file(out_fn)
 
 	def export_scene_resources(self, context, objs, resources, progress):
 		from .export_object import ObjectExporter
 		object_export = ObjectExporter()
 		object_export.single_file = False
 
-		material_maps = {}
+		material_atlases = {}
 
 		for i, o in enumerate(objs):
 			progress.push_task_slice(o.name, i, len(objs))
-			object_export.export_object_resources(context, o, resources, progress, material_maps=material_maps)
+			object_export.export_object_resources(context, o, resources, progress, material_atlases=material_atlases)
 			obj_name = o.name+".object"
 			resources[obj_name] = object_export.export_object(context, o, progress, resources=resources)
 			progress.pop_task()
 
 	def export_scene(self, context, objs, progress, *, prototypes, resources):
 		from .datafile import Resource, Statement
-		scene_res = Resource("scene.scene")
+		scene_res = Resource("scene.scene", "scene")
 
 		for o in objs:
 			obj_res = resources[prototypes[o.name].name+".object"]