X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=6a194dfbe59e5352a79a3d2f6344c5970e72fbd8;hb=7833c79d7d8c0741f7f3a99c7af24654a2d2f811;hp=d62276f76221bbcf3d89ea3e78aadc6040fd8599;hpb=6b9338845dfee441cd18ad6c633e4feef8ad14e1;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index d62276f7..6a194dfb 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,55 +1,71 @@
 import os
 
 def create_technique_resource(material, resources):
-	# This operates on a Blender material, not a custom object
-	from .datafile import Resource, Statement
+	from .datafile import Resource, Statement, Token
 	tech_res = Resource(material.name+".tech", "technique")
 
 	mat_res = resources[material.name+".mat"]
 
-	st = Statement("pass", "")
-	if mat_res:
-		st.sub.append(tech_res.create_embed_statement("material", mat_res))
+	blend_st = None
+	if material.blended:
+		blend_st = Statement("blend", Token("SRC_ALPHA"), Token("ONE_MINUS_SRC_ALPHA"))
 
 	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)
+		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 m.tag=="blended" and blend_st:
+				st.sub.append(blend_st)
+
+			shader = m.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)
+
+			tech_res.statements.append(st)
 	else:
+		base_method = "blended" if material.blended else ""
+		st = Statement("method", base_method)
+		if mat_res:
+			st.sub.append(tech_res.create_embed_statement("material", mat_res))
+
+		if blend_st:
+			st.sub.append(blend_st)
 		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("pass", "shadow")
-		st.sub.append(Statement("shader", "_occluder.glsl.shader"))
 		tech_res.statements.append(st)
 
+		if material.cast_shadows:
+			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:
-	def create_texture_exporter(self):
-		from .export_texture import TextureExporter
-		texture_export = TextureExporter()
-		return texture_export
-
 	def export_technique_resources(self, material, resources):
-		from .export_texture import SamplerExporter
-		texture_export = self.create_texture_exporter()
+		from .export_texture import SamplerExporter, TextureExporter
+		texture_export = TextureExporter()
 		sampler_export = SamplerExporter()
 
 		from .material import Material
-		material = Material(material)
+		if type(material)!=Material:
+			material = Material(material)
 
 		for p in material.properties:
 			if p.texture:
@@ -69,6 +85,10 @@ class MaterialExporter:
 				resources[mat_name] = None
 
 	def export_technique(self, material, resources):
+		from .material import Material
+		if type(material)!=Material:
+			material = Material(material)
+
 		return create_technique_resource(material, resources)
 
 	def export_material(self, material, resources):
@@ -84,11 +104,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
 
@@ -97,11 +116,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: