X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=7918af786a03243af401eb9ae6e6f00146a125ab;hb=d5b484e2aee6c485abd4d07631f6d863eaaa90a0;hp=2d2c25ed8013369c74661ba7b1f3c6b087193bec;hpb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 2d2c25ed..7918af78 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -7,6 +7,12 @@ def linear_to_srgb(l):
 	else:
 		return 1.055*(l**(1/2.4))-0.055
 
+def get_colormap(srgb):
+	if srgb:
+		return linear_to_srgb
+	else:
+		return lambda x: x
+
 def image_name(i):
 	fp = i.filepath
 	if fp:
@@ -24,8 +30,6 @@ def external_name(out_file, ext, index):
 
 class ObjectExporter:
 	def __init__(self):
-		self.material_tex = False
-		self.srgb_colors = True
 		self.textures = "REF"
 		self.separate_mesh = False
 		self.shared_mesh = True
@@ -34,11 +38,9 @@ class ObjectExporter:
 		self.shared_tech = True
 		self.export_lods = True
 
-	def export(self, context, out_file, objs=None, progress=None):
-		if objs is None:
+	def export(self, context, out_file, obj=None, progress=None):
+		if obj is None:
 			obj = context.active_object
-		else:
-			obj = objs[0]
 
 		lods = [obj]
 		for c in obj.children:
@@ -67,10 +69,9 @@ class ObjectExporter:
 		for i, l in enumerate(lods):
 			if i>0:
 				out_file.begin("level_of_detail", i)
-				objs = [l]
 
 			if i==0 or l.data.name!=prev_mesh:
-				mesh = self.export_object_mesh(context, out_file, l, objs, progress)
+				mesh = self.export_object_mesh(context, out_file, l, progress)
 				prev_mesh = l.data.name
 
 			same_tech = True
@@ -88,37 +89,32 @@ class ObjectExporter:
 			if i>0:
 				out_file.end()
 
-	def export_object_mesh(self, context, out_file, lod, objs, progress):
+	def export_object_mesh(self, context, out_file, obj, progress):
 		from .export_mesh import MeshExporter
 		mesh_export = MeshExporter()
 		for k, v in self.__dict__.items():
 			setattr(mesh_export, k, v)
 
 		lod_index = 0
-		if lod.lod_for_parent:
-			lod_index = lod.lod_index
+		if obj.lod_for_parent:
+			lod_index = obj.lod_index
 
 		if self.separate_mesh:
 			from .outfile import open_output
 			path, name = external_name(out_file, ".mesh", lod_index)
 			if self.shared_mesh:
-				name = lod.data.name+".mesh"
+				name = obj.data.name+".mesh"
 			mesh_out = open_output(os.path.join(path, name))
-			mesh = mesh_export.export(context, mesh_out, objs, progress)
+			mesh = mesh_export.export(context, mesh_out, obj, progress)
 			out_file.write("mesh", '"{}"'.format(name))
 		else:
 			out_file.begin("mesh")
-			mesh = mesh_export.export(context, out_file, objs, progress)
+			mesh = mesh_export.export(context, out_file, obj, progress)
 			out_file.end()
 
 		return mesh
 
 	def export_object_technique(self, obj, mesh, out_file, lod_index):
-		if self.srgb_colors:
-			self.colormap = linear_to_srgb
-		else:
-			self.colormap = lambda x: x
-
 		material = None
 		if obj.material_slots:
 			material = obj.material_slots[0].material
@@ -154,15 +150,13 @@ class ObjectExporter:
 			out_file.write("technique", '"{}"'.format(name))
 		else:
 			out_file.begin("technique")
-			self.export_technique_definition(material, mesh, out_file)
+			self.export_technique_definition(material, obj.material_tex, mesh, out_file)
 			out_file.end()
 
-	def export_technique_definition(self, material, mesh, out_file):
+	def export_technique_definition(self, material, material_tex, mesh, out_file):
 		out_file.begin("pass", '""')
 		if material:
-			cm = self.colormap
-
-			if self.material_tex:
+			if material_tex:
 				out_file.begin("material")
 				out_file.write("diffuse", 1.0, 1.0, 1.0, 1.0)
 				out_file.end()
@@ -177,7 +171,8 @@ class ObjectExporter:
 				out_file.write("storage", "RGB", len(mesh.materials), 1)
 				texdata = '"'
 				for m in mesh.materials:
-					color = [int(cm(c)*255) for c in m.diffuse_color*mat.diffuse_intensity]
+					cm = get_colormap(m.srgb_colors)
+					color = [int(cm(c)*255) for c in m.diffuse_color*m.diffuse_intensity]
 					texdata += "\\x%02X\\x%02X\\x%02X"%tuple(color)
 				texdata += '"'
 				out_file.write("raw_data", texdata)
@@ -222,7 +217,7 @@ class ObjectExporter:
 		out_file.end()
 
 	def export_material(self, mat, out_file):
-		cm = self.colormap
+		cm = get_colormap(mat.srgb_colors)
 		if any((s and s.use_map_color_diffuse) for s in mat.texture_slots):
 			out_file.write("diffuse", 1.0, 1.0, 1.0, 1.0)
 			amb = cm(mat.ambient)