X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=9b36c48ff43faadb0f7ef6da596f37e7806dfd47;hp=f6776107413955964d0e3e757bc5594e3a69d03f;hb=d5c26741ed3952dd54c8a7f43ad42ba79bf2d977;hpb=6ee541fd39de1e1368134cb8a98a14f2f5ddd767

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index f6776107..9b36c48f 100644
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -18,6 +18,7 @@ class SceneExporter:
 
 		object_prototypes = {}
 		unique_objects = []
+		export_names = {}
 		for o in objs:
 			if o.name in object_prototypes:
 				continue
@@ -36,6 +37,16 @@ class SceneExporter:
 
 					clones.append(u)
 
+			prefix = o.name
+			for c in clones:
+				for i in range(min(len(c.name), len(prefix))):
+					if c.name[i]!=prefix[i]:
+						prefix = prefix[:i]
+						break
+
+			if prefix:
+				export_names[o.name+".object"] = prefix.strip(" .")+".object"
+
 			unique_objects.append(o)
 			for c in clones:
 				object_prototypes[c.name] = o
@@ -43,42 +54,61 @@ class SceneExporter:
 		from .util import Progress
 		progress = Progress(self.show_progress and context)
 
-		from .export_object import ObjectExporter
-		object_export = ObjectExporter()
+		resources = {}
+		self.export_scene_resources(context, unique_objects, resources, progress)
+		for n, r in resources.items():
+			if r.name in export_names:
+				r.name = export_names[r.name]
+
+		scene_res = self.export_scene(context, objs, progress, prototypes=object_prototypes, resources=resources)
+		refs = scene_res.collect_references()
 
 		from .datafile import Statement
 		if self.resource_collection:
+			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 i, o in enumerate(unique_objects):
-					progress.push_task_slice(o.name, i, len(unique_objects))
-					st = Statement("object", "{}.object".format(o.name))
-					st.sub = object_export.export_object(context, o, progress)
+				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)
-					progress.pop_task()
 		else:
 			res_dir = os.path.join(path, base+"_resources")
 			if not os.path.exists(res_dir):
 				os.makedirs(res_dir)
-			for i, o in enumerate(unique_objects):
-				progress.push_task_slice(o.name, i, len(unique_objects))
-				st = object_export.export_object(context, o, progress)
-				with open(os.path.join(res_dir, o.name+".object"), "w") as obj_out:
-					for s in st:
-						s.write_to_file(obj_out)
-				progress.pop_task()
-
-		statements = self.export_scene(context, objs, progress, prototypes=object_prototypes)
+			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)
 
 		with open(out_fn, "w") as out_file:
-			for s in statements:
+			for s in scene_res.statements:
 				s.write_to_file(out_file)
 
-	def export_scene(self, context, objs, progress, *, prototypes=None):
-		from .datafile import Statement
-		statements = []
+	def export_scene_resources(self, context, objs, resources, progress):
+		from .export_object import ObjectExporter
+		object_export = ObjectExporter()
+		object_export.single_file = False
+
+		material_maps = {}
+
+		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)
+			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")
 
 		for o in objs:
-			st = Statement("object", "{}.object".format(prototypes[o.name].name))
+			obj_res = resources[prototypes[o.name].name+".object"]
+			st = scene_res.create_reference_statement("object", obj_res, o.name)
 			# XXX Parent relationships screw up the location and rotation
 			st.sub.append(Statement("position", o.location[0], o.location[1], o.location[2]))
 			if o.rotation_mode=="AXIS_ANGLE":
@@ -93,8 +123,8 @@ class SceneExporter:
 				axis = q.axis
 			st.sub.append(Statement("rotation", angle*180/math.pi, axis[0], axis[1], axis[2]))
 			st.sub.append(Statement("scale", o.scale[0], o.scale[1], o.scale[2]))
-			statements.append(st)
+			scene_res.statements.append(st)
 
 		progress.set_progress(1.0)
 
-		return statements
+		return scene_res