X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=6e399b0199f9f77b10175fe5a4a86027d29a88cc;hp=bcd2c6ecfb05c70a0646a603cc0a6456ebd52317;hb=7ffc6b595b9c8405d1044f8a4d4d3098392e13fa;hpb=ea3e95735fcd9d6a80d23dbd90667eb2f1c95ef4

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index bcd2c6ec..6e399b01 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -6,9 +6,8 @@ class ObjectExporter:
 		self.show_progress = True
 		self.use_strips = True
 		self.use_degen_tris = False
-		self.textures = "REF"
-		self.separate_mesh = False
-		self.separate_tech = False
+		self.use_textures = True
+		self.single_file = True
 		self.shared_resources = True
 		self.export_lods = True
 
@@ -45,9 +44,16 @@ class ObjectExporter:
 	def create_material_exporter(self):
 		from .export_material import MaterialExporter
 		material_export = MaterialExporter()
-		material_export.textures = self.textures
+		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
 
@@ -82,24 +88,41 @@ class ObjectExporter:
 			for s in obj_res.statements:
 				s.write_to_file(out_file)
 
-	def export_object_resources(self, context, obj, resources, progress):
+	def export_object_resources(self, context, obj, resources, progress, material_maps=None):
+		if material_maps is None:
+			material_maps = {}
+
 		lods = self.collect_object_lods(obj)
 
 		from .mesh import create_mesh_from_object
+		from .material import create_material_map
 		mesh_export = self.create_mesh_exporter()
 		material_export = self.create_material_exporter()
+		material_map_export = self.create_material_map_exporter()
 
 		for i, l in enumerate(lods):
 			lod_index = l.lod_index if l.lod_for_parent else 0
 			progress.push_task_slice("LOD {}".format(lod_index), i, len(lods))
 
-			mesh_name = l.data.name+".mesh"
-			if mesh_name not in resources:
-				mesh = create_mesh_from_object(context, l, progress)
-				mesh_res = mesh_export.export_mesh(context, mesh, progress)
-				resources[mesh_name] = mesh_res
+			material_map = None
+			mapped_count = sum(m.material_map for m in l.data.materials if m)
+			if mapped_count:
+				material_map_tech = l.data.materials[0].technique
+				tech_mismatch = any(m.technique!=material_map_tech for m in l.data.materials)
+				if mapped_count!=len(l.data.materials) or tech_mismatch:
+					raise Exception("Conflicting settings in object materials")
+
+				if material_map_tech in material_maps:
+					material_map = material_maps[material_map_tech]
+				else:
+					material_map = create_material_map(context, l.data.materials[0])
+					material_maps[material_map_tech] = material_map
 
-			if l.material_slots and l.material_slots[0].material:
+				tech_name = "material_map_{}.tech".format(os.path.splitext(material_map_tech)[0])
+				if tech_name not in resources:
+					material_map_export.export_technique_resources(material_map, resources)
+					resources[tech_name] = material_map_export.export_technique(material_map, resources=resources)
+			elif l.material_slots and l.material_slots[0].material:
 				material = l.material_slots[0].material
 				tech_name = material.name+".tech"
 				if tech_name not in resources:
@@ -108,6 +131,12 @@ class ObjectExporter:
 			elif "stub.tech" not in resources:
 				resources["stub.tech"] = self.export_stub_technique()
 
+			mesh_name = l.data.name+".mesh"
+			if mesh_name not in resources:
+				mesh = create_mesh_from_object(context, l, progress, material_map=material_map)
+				mesh_res = mesh_export.export_mesh(context, mesh, progress)
+				resources[mesh_name] = mesh_res
+
 			progress.pop_task()
 
 	def export_object(self, context, obj, progress, *, resources=None):
@@ -131,7 +160,7 @@ class ObjectExporter:
 
 			if l.data.name!=prev_mesh:
 				mesh_res = resources[l.data.name+".mesh"]
-				if self.separate_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))
@@ -142,14 +171,17 @@ class ObjectExporter:
 			if l.material_slots:
 				material = l.material_slots[0].material
 			if material:
-				tech_res = resources[material.name+".tech"]
+				if material.material_map:
+					tech_res = resources["material_map_{}.tech".format(os.path.splitext(material.technique)[0])]
+				else:
+					tech_res = resources[material.name+".tech"]
 			else:
 				tech_res = resources["stub.tech"]
 
 			if tech_res.name!=prev_tech:
-				if material and material.technique and not material.inherit_tech:
+				if material and not material.material_map and material.technique and not material.inherit_tech:
 					lod_st.append(Statement("technique", material.technique))
-				elif self.separate_tech:
+				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))