X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=356186df17c5b2341e525322cc69f3607ce4513f;hb=b128c6434774f79998b95525ed06e420bfe0306b;hp=8619142e9b4dff53d4543c2b8a3e31dde6cff016;hpb=5c3e77f72d30b93ab775eb41eba4efcdabb0f074;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 8619142e..356186df 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -18,7 +18,7 @@ class MaterialExporter:
 		if mat_name not in resources:
 			resources[mat_name] = self.export_material(material)
 
-		if self.use_textures:
+		if False and self.use_textures:
 			for s in material.texture_slots:
 				if s and s.texture.type=='IMAGE' and s.texture.image:
 					tex_name = s.texture.name+".tex2d"
@@ -31,7 +31,7 @@ class MaterialExporter:
 
 		mat_res = resources[material.name+".mat"]
 		textures = {}
-		if self.use_textures:
+		if False and self.use_textures:
 			image_texture_slots = [s for s in material.texture_slots if s and s.texture.type=='IMAGE' and s.texture.image]
 			for s in image_texture_slots:
 				if s.use_map_color_diffuse:
@@ -51,8 +51,9 @@ class MaterialExporter:
 
 			st = Statement("inherit", material.technique)
 			for s, t in textures.items():
-				if t.default_filter and t.image.filepath:
-					st.sub.append(Statement("texture", s, os.path.basename(t.image.filepath)))
+				fn = os.path.basename(t.image.filepath)
+				if t.default_filter and fn:
+					st.sub.append(Statement("texture", s, fn))
 				else:
 					st.sub.append(tech_res.create_reference_statement("texture", s, resources[t.name+".tex2d"]))
 			if material.override_material:
@@ -69,10 +70,11 @@ class MaterialExporter:
 				diffuse_tex = textures["diffuse_map"]
 				tex_res = resources[diffuse_tex.name+".tex2d"]
 				ss = Statement("texunit", 0)
+				fn = os.path.basename(diffuse_tex.image.filepath)
 				if self.single_file:
 					ss.sub.append(tech_res.create_embed_statement("texture2d", tex_res))
-				elif diffuse_tex.default_filter and diffuse_tex.image.filepath:
-					ss.sub.append(Statement("texture", os.path.basename(diffuse_tex.image.filepath)))
+				elif diffuse_tex.default_filter and fn:
+					ss.sub.append(Statement("texture", fn))
 				else:
 					ss.sub.append(tech_res.create_reference_statement("texture", tex_res))
 				st.sub.append(ss)
@@ -89,18 +91,17 @@ class MaterialExporter:
 		from .util import get_colormap
 		cm = get_colormap(material.srgb_colors)
 
-		if any(s.use_map_color_diffuse for s in material.texture_slots if s):
+		if False and any(s.use_map_color_diffuse for s in material.texture_slots if s):
 			statements.append(Statement("diffuse", 1.0, 1.0, 1.0, 1.0))
 			amb = cm(material.ambient)
 			statements.append(Statement("ambient", amb, amb, amb, 1.0))
 		else:
-			diff = material.diffuse_color*material.diffuse_intensity
-			statements.append(Statement("diffuse", cm(diff.r), cm(diff.g), cm(diff.b), 1.0))
-			amb = diff*material.ambient
-			statements.append(Statement("ambient", cm(amb.r), cm(amb.g), cm(amb.b), 1.0))
+			diff = material.diffuse_color
+			statements.append(Statement("diffuse", cm(diff[0]), cm(diff[1]), cm(diff[2]), 1.0))
+			statements.append(Statement("ambient", cm(diff[0]), cm(diff[1]), cm(diff[2]), 1.0))
 		spec = material.specular_color*material.specular_intensity
 		statements.append(Statement("specular", cm(spec.r), cm(spec.g), cm(spec.g), 1.0))
-		statements.append(Statement("shininess", material.specular_hardness))
+		statements.append(Statement("shininess", min(2/material.roughness**2-2, 250)))
 
 		return mat_res