X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=a12474af94bbfe5505a0d7e8d2fd016b1774aebf;hb=169057d48d44846bc433753f20ee884204be9192;hp=8065c09ad4a2bac0219eb7ed2254b4c3dfcb6ab8;hpb=44fc9b88ead11e7325bd193e4c853f8b10e9b175;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 8065c09a..a12474af 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -6,6 +6,13 @@ def linear_to_srgb(l):
 	else:
 		return 1.055*(l**(1/2.4))-0.055
 
+def image_name(i):
+	fp = i.filepath
+	if fp:
+		return os.path.split(fp)[1]
+	else:
+		return i.name
+
 
 class ObjectExporter:
 	def __init__(self):
@@ -13,8 +20,16 @@ class ObjectExporter:
 		self.srgb_colors = True
 		self.textures = "REF"
 		self.separate_mesh = False
+		self.separate_tech = False
+		self.external_tech = True
+		self.shared_tech = True
+
+	def export(self, context, out_file, objs=None, progress=None):
+		if objs is None:
+			obj = context.active_object
+		else:
+			obj = objs[0]
 
-	def export(self, context, out_file):
 		from .outfile import open_output
 		out_file = open_output(out_file)
 
@@ -27,14 +42,44 @@ class ObjectExporter:
 			path, base = os.path.split(out_file.filename)
 			base, ext = os.path.splitext(base)
 			mesh_out = open_output(os.path.join(path, base+".mesh"))
-			mesh = mesh_export.export(context, mesh_out)
-			out_file.write("mesh", "\""+base+".mesh\"")
+			mesh = mesh_export.export(context, mesh_out, objs, progress)
+			out_file.write("mesh", '"{}.mesh"'.format(base))
 		else:
 			out_file.begin("mesh")
-			mesh = mesh_export.export(context, out_file)
+			mesh = mesh_export.export(context, out_file, objs, progress)
+			out_file.end()
+
+		if self.external_tech and obj.technique:
+			if obj.inherit_tech and mesh.materials[0].texture_slots:
+				out_file.begin("technique")
+				out_file.begin("inherit", '"{}"'.format(obj.technique))
+				for slot in mesh.materials[0].texture_slots:
+					if slot and slot.texture.type=="IMAGE":
+						name = image_name(slot.texture.image)
+						if slot.use_map_color_diffuse:
+							out_file.write("texture", '"diffuse_map"', '"{}"'.format(name))
+						elif slot.use_map_normal:
+							out_file.write("texture", '"normal_map"', '"{}"'.format(name))
+				out_file.end()
+				out_file.end()
+			else:
+				out_file.write("technique", '"{}"'.format(obj.technique))
+		elif self.separate_tech:
+			path, base = os.path.split(out_file.filename)
+			if self.shared_tech and mesh.materials:
+				tech_name = mesh.materials[0].name+".tech"
+			else:
+				base, ext = os.path.splitext(base)
+				tech_name = base+".tech"
+			tech_out = open_output(os.path.join(path, tech_name))
+			self.export_technique(mesh, tech_out)
+			out_file.write("technique", '"{}"'.format(tech_name))
+		else:
+			out_file.begin("technique")
+			self.export_technique(mesh, out_file)
 			out_file.end()
 
-		out_file.begin("technique")
+	def export_technique(self, mesh, out_file):
 		out_file.begin("pass", '""')
 		if mesh.materials:
 			if self.srgb_colors:
@@ -57,7 +102,7 @@ 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]
+					color = [int(cm(c)*255) for c in m.diffuse_color*mat.diffuse_intensity]
 					texdata += "\\x%02X\\x%02X\\x%02X"%tuple(color)
 				texdata += '"'
 				out_file.write("raw_data", texdata)
@@ -71,7 +116,7 @@ class ObjectExporter:
 					amb = cm(mat.ambient)
 					out_file.write("ambient", amb, amb, amb, 1.0)
 				else:
-					diff = mat.diffuse_color
+					diff = mat.diffuse_color*mat.diffuse_intensity
 					out_file.write("diffuse", cm(diff.r), cm(diff.g), cm(diff.b), 1.0)
 					amb = diff*mat.ambient
 					out_file.write("ambient", cm(amb.r), cm(amb.g), cm(amb.b), 1.0)
@@ -108,8 +153,7 @@ class ObjectExporter:
 						out_file.write("raw_data", texdata)
 						out_file.end()
 					else:
-						out_file.write("texture", '"%s"'%tex.image.name)
+						out_file.write("texture", '"%s"'%image_name(tex.image))
 					out_file.end()
 
 		out_file.end()
-		out_file.end()