X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=69782b64cbb4cd7c3edf4fb3ebcd8064313141d3;hb=08942dd73918a51baefbe7344b62afc0cad42e55;hp=2d85b10f3c7c4b26aa9e45803b0ca2af7d9134eb;hpb=7834588fc4f3846641bb9eed680a8890b8852a9a;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 2d85b10f..69782b64 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -7,40 +7,46 @@ def create_technique_resource(material, resources):
 
 	mat_res = resources[material.name+".mat"]
 
-	st = Statement("pass", "")
-	if mat_res:
-		st.sub.append(tech_res.create_embed_statement("material", mat_res))
-
 	if material.render_mode=='CUSTOM':
-		shader = material.shader
-		if shader.endswith(".glsl"):
-			shader += ".shader"
-		st.sub.append(Statement("shader", shader))
-
-		if material.uniforms:
-			ss = Statement("uniforms")
-			for u in material.uniforms:
-				ss.sub.append(Statement("uniform", u.name, *u.values[:u.size]))
-			st.sub.append(ss)
-	else:
-		if material.receive_shadows:
-			st.sub.append(Statement("receive_shadows", True))
-		if material.image_based_lighting:
-			st.sub.append(Statement("image_based_lighting", True))
-
-	tech_res.statements.append(st)
+		for m in material.render_methods:
+			st = Statement("method", m.tag)
+			if mat_res and m.use_material:
+				st.sub.append(tech_res.create_reference_statement("material", mat_res))
 
-	if material.shadow_method!='NONE':
-		st = Statement("pass", "shadow")
-		if material.render_mode=='CUSTOM':
-			shader = material.shadow_shader or material.shader
+			shader = m.shader
 			if shader.endswith(".glsl"):
 				shader += ".shader"
 			st.sub.append(Statement("shader", shader))
-		else:
-			st.sub.append(Statement("shader", "_occluder.glsl.shader"))
+
+			if material.uniforms:
+				ss = Statement("uniforms")
+				for u in material.uniforms:
+					ss.sub.append(Statement("uniform", u.name, *u.values[:u.size]))
+				st.sub.append(ss)
+
+			tech_res.statements.append(st)
+	else:
+		st = Statement("method", "")
+		if mat_res:
+			st.sub.append(tech_res.create_embed_statement("material", mat_res))
+
+		if material.render_mode!='CUSTOM':
+			if material.receive_shadows:
+				st.sub.append(Statement("receive_shadows", True))
+			if material.image_based_lighting:
+				st.sub.append(Statement("image_based_lighting", True))
+
 		tech_res.statements.append(st)
 
+		if material.shadow_method!='NONE':
+			st = Statement("method", "shadow")
+			st.sub.append(Statement("shader", "occluder.glsl.shader"))
+			tech_res.statements.append(st)
+
+			st = Statement("method", "shadow_thsm")
+			st.sub.append(Statement("shader", "occluder_thsm.glsl.shader"))
+			tech_res.statements.append(st)
+
 	return tech_res
 
 class MaterialExporter:
@@ -90,11 +96,10 @@ class MaterialExporter:
 			if st:
 				mat_res.statements.append(st)
 		textures = [p.texture for p in material.properties if p.texture]
-		if textures and not all(t.default_filter for t in textures):
+		if textures:
 			from .export_texture import SamplerExporter
-			sampler_tex = next(t for t in textures if not t.default_filter)
 			sampler_export = SamplerExporter()
-			mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(sampler_tex)]))
+			mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
 
 		return mat_res
 
@@ -103,11 +108,7 @@ class MaterialExporter:
 		if prop.texture:
 			tex_res = resources[prop.texture.image.name+".tex2d"]
 			from .util import basename
-			fn = basename(prop.texture.image.filepath)
-			if prop.texture.default_filter and fn:
-				return Statement(prop.tex_keyword, fn)
-			else:
-				return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
+			return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
 		elif not prop.keyword:
 			return
 		elif type(prop.value)==tuple: