X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=541572f5da9c309d047215d1e6f2f286147d48bd;hb=5bf3c7175c359ad8509702a4e0790609b39e6aec;hp=7c1c56034053a65dff98dd1d0e0bf1f8c5e37788;hpb=147f7097b77e591197dc38b2b263add57d69e4fc;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 7c1c5603..541572f5 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -48,10 +48,10 @@ class ObjectExporter:
 		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()
-		return material_map_export
+	def create_material_atlas_exporter(self):
+		from .export_material import MaterialAtlasExporter
+		material_atlas_export = MaterialAtlasExporter()
+		return material_atlas_export
 
 	def export_to_file(self, context, out_fn):
 		if self.export_all:
@@ -95,41 +95,41 @@ class ObjectExporter:
 
 			progress.pop_task()
 
-	def export_object_resources(self, context, obj, resources, progress, material_maps=None):
-		if material_maps is None:
-			material_maps = {}
+	def export_object_resources(self, context, obj, resources, progress, material_atlass=None):
+		if material_atlass is None:
+			material_atlass = {}
 
 		lods = self.collect_object_lods(obj)
 
 		from .mesh import create_mesh_from_object
-		from .material import create_material_map
+		from .material import create_material_atlas
 		mesh_export = self.create_mesh_exporter()
 		material_export = self.create_material_exporter()
-		material_map_export = self.create_material_map_exporter()
+		material_atlas_export = self.create_material_atlas_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))
 
-			material_map = None
-			mapped_count = sum(m.render_mode!='EXTERNAL' and m.material_map for m in l.data.materials if m)
-			if mapped_count:
+			material_atlas = None
+			atlas_flags = [m.render_mode!='EXTERNAL' and m.material_atlas for m in l.data.materials if m]
+			if any(atlas_flags):
 				mmk = lambda m: m.shader if m.render_mode=='CUSTOM' else ""
-				material_map_key = mmk(l.data.materials[0])
-				key_mismatch = any(mmk(m)!=material_map_key for m in l.data.materials)
-				if mapped_count!=len(l.data.materials) or key_mismatch:
+				material_atlas_key = mmk(l.data.materials[0])
+				key_mismatch = any(mmk(m)!=material_atlas_key for m in l.data.materials)
+				if not all(atlas_flags) or key_mismatch:
 					raise Exception("Conflicting settings in object materials")
 
-				if material_map_key in material_maps:
-					material_map = material_maps[material_map_key]
+				if material_atlas_key in material_atlass:
+					material_atlas = material_atlass[material_atlas_key]
 				else:
-					material_map = create_material_map(context, l.data.materials[0])
-					material_maps[material_map_key] = material_map
+					material_atlas = create_material_atlas(context, l.data.materials[0])
+					material_atlass[material_atlas_key] = material_atlas
 
-				tech_name = "{}.tech".format(material_map.name)
+				tech_name = "{}.tech".format(material_atlas.name)
 				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)
+					material_atlas_export.export_technique_resources(material_atlas, resources)
+					resources[tech_name] = material_atlas_export.export_technique(material_atlas, resources=resources)
 			elif l.material_slots and l.material_slots[0].material:
 				material = l.material_slots[0].material
 				if material.render_mode!='EXTERNAL':
@@ -142,7 +142,7 @@ class ObjectExporter:
 
 			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 = create_mesh_from_object(context, l, progress, material_atlas=material_atlas)
 				mesh_res = mesh_export.export_mesh(context, mesh, progress)
 				resources[mesh_name] = mesh_res
 
@@ -179,8 +179,8 @@ class ObjectExporter:
 			if material:
 				if material.render_mode=='EXTERNAL':
 					tech_name = material.technique
-				elif material.material_map:
-					tech_name = "material_map_{}.tech".format(os.path.splitext(material.technique)[0])
+				elif material.material_atlas:
+					tech_name = "material_atlas_{}.tech".format(os.path.splitext(material.technique)[0])
 				else:
 					tech_name = material.name+".tech"
 			else: