X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=617a683f9628ffcbde9e69d5adbd9333efd5452b;hb=27ba68e3d81098c59b7114a8f54996278c05e4ef;hp=19c22d1fba598bb89449032e2cff2e950efe988a;hpb=8323eb754769cb6db7e02f4226cc9eedc5e614cf;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 19c22d1f..617a683f 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,61 +1,64 @@
 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("method", "")
-	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)
+		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))
+
+			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 material.blended:
+			ss.sub.append(Statement("blend", Token("SRC_ALPHA"), Token("ONE_MINUS_SRC_ALPHA")))
 		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)
+		tech_res.statements.append(st)
 
-	if material.shadow_method!='NONE':
-		st = Statement("method", "shadow")
-		if material.render_mode=='CUSTOM':
-			shader = material.shadow_shader or material.shader
-			if shader.endswith(".glsl"):
-				shader += ".shader"
-			st.sub.append(Statement("shader", shader))
-		else:
+		if material.cast_shadows:
+			st = Statement("method", "shadow")
 			st.sub.append(Statement("shader", "occluder.glsl.shader"))
-		tech_res.statements.append(st)
+			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:
@@ -75,6 +78,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):