X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=dcb5623f06a24bd632e43c82bdba2a9bd887f2b7;hb=2a9f8f3803e1b57e0e5325454266d4e701b38cc5;hp=5b81ace45e6cce1a01416e3acb49f4e51d331a78;hpb=180b20bee11425a776c5ead05afcf6a63945d3b2;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 5b81ace4..dcb5623f 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -7,7 +7,8 @@ class ObjectExporter:
 		self.use_strips = True
 		self.use_degen_tris = False
 		self.use_textures = True
-		self.single_file = True
+		self.export_all = False
+		self.collection = False
 		self.shared_resources = True
 		self.export_lods = True
 
@@ -44,49 +45,55 @@ class ObjectExporter:
 	def create_material_exporter(self):
 		from .export_material import MaterialExporter
 		material_export = MaterialExporter()
-		material_export.single_file = self.single_file
 		material_export.use_textures = self.use_textures
 		return material_export
 
 	def create_material_map_exporter(self):
 		from .export_material import MaterialMapExporter
 		material_map_export = MaterialMapExporter()
-		material_map_export.single_file = self.single_file
 		return material_map_export
 
 	def export_to_file(self, context, out_fn):
-		obj = context.active_object
+		if self.export_all:
+			objs = [o for o in context.selected_objects if o.type=="MESH"]
+		else:
+			objs = [context.active_object]
 
 		from .util import Progress
 		progress = Progress(self.show_progress and context)
 
 		path, base = os.path.split(out_fn)
-		base = os.path.splitext(base)[0]
+		base, ext = os.path.splitext(base)
 
 		resources = {}
-		self.export_object_resources(context, obj, resources, progress)
-
-		obj_res = self.export_object(context, obj, progress, resources=resources)
-		refs = obj_res.collect_references()
-		if not self.shared_resources:
-			numbers = {}
-			for r in refs:
-				ext = os.path.splitext(r.name)[1]
-				n = numbers.get(ext, 0)
-				if n>0:
-					r.name = "{}_{}{}".format(base, n, ext)
-				else:
-					r.name = base+ext
-				numbers[ext] = n+1
+		for i, obj in enumerate(objs):
+			if self.export_all:
+				out_fn = os.path.join(path, obj.name+ext)
+
+			progress.push_task_slice(obj.name, i, len(objs))
+			self.export_object_resources(context, obj, resources, progress)
 
-		for r in refs:
-			with open(os.path.join(path, r.name), "w") as out_file:
-				for s in r.statements:
-					s.write_to_file(out_file)
+			obj_res = self.export_object(context, obj, progress, resources=resources)
+			refs = obj_res.collect_references()
+			if not self.shared_resources:
+				numbers = {}
+				for r in refs:
+					res_ext = os.path.splitext(r.name)[1]
+					n = numbers.get(res_ext, 0)
+					if n>0:
+						r.name = "{}_{}{}".format(base, n, res_ext)
+					else:
+						r.name = base+res_ext
+					numbers[res_ext] = n+1
+
+			if self.collection:
+				obj_res.write_collection(out_fn)
+			else:
+				for r in refs:
+					r.write_to_file(os.path.join(path, r.name))
+				obj_res.write_to_file(out_fn)
 
-		with open(out_fn, "w") as out_file:
-			for s in obj_res.statements:
-				s.write_to_file(out_file)
+			progress.pop_task()
 
 	def export_object_resources(self, context, obj, resources, progress, material_maps=None):
 		if material_maps is None:
@@ -149,7 +156,7 @@ class ObjectExporter:
 		lods = self.collect_object_lods(obj)
 
 		from .datafile import Resource, Statement
-		obj_res = Resource(obj.name+".object")
+		obj_res = Resource(obj.name+".object", "object")
 		statements = obj_res.statements
 
 		center, radius = self.compute_bounding_sphere(obj)
@@ -162,10 +169,7 @@ class ObjectExporter:
 
 			if l.data.name!=prev_mesh:
 				mesh_res = resources[l.data.name+".mesh"]
-				if not self.single_file:
-					lod_st.append(obj_res.create_reference_statement("mesh", mesh_res))
-				else:
-					lod_st.append(obj_res.create_embed_statement("mesh", mesh_res))
+				lod_st.append(obj_res.create_reference_statement("mesh", mesh_res))
 
 				prev_mesh = l.data.name
 
@@ -183,10 +187,8 @@ class ObjectExporter:
 			if tech_res.name!=prev_tech:
 				if material and material.render_mode=='EXTERNAL':
 					lod_st.append(Statement("technique", material.technique))
-				elif not self.single_file:
-					lod_st.append(obj_res.create_reference_statement("technique", tech_res))
 				else:
-					lod_st.append(obj_res.create_embed_statement("technique", tech_res))
+					lod_st.append(obj_res.create_reference_statement("technique", tech_res))
 				prev_tech = tech_res.name
 
 			if i>0:
@@ -202,7 +204,7 @@ class ObjectExporter:
 
 	def export_stub_technique(self):
 		from .datafile import Resource, Statement
-		tech_res = Resource("stub.tech")
+		tech_res = Resource("stub.tech", "technique")
 		pass_st = Statement("pass", "")
 		tech_res.statements.append(pass_st)
 		mat_st = Statement("material")