X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=8a87011a25d93d1c54bb376c05ba02473488ab3e;hb=dbc91b65728ab9c0e574bb1127cfe4d2da55de7f;hp=81c5e8bfd868480e87b9bdf49b7b216d3b830f19;hpb=9f8b7c740f3251ba5c6d94954431709d149aafae;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 81c5e8bf..8a87011a 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,6 +1,7 @@
 import os
 
 def create_technique_resource(material, resources):
+	# This operates on a Blender material, not a custom object
 	from .datafile import Resource, Statement
 	tech_res = Resource(material.name+".tech", "technique")
 
@@ -21,19 +22,31 @@ def create_technique_resource(material, resources):
 			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)
 
+	if material.shadow_method!='NONE':
+		st = Statement("pass", "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:
+			st.sub.append(Statement("shader", "_occluder.glsl.shader"))
+		tech_res.statements.append(st)
+
 	return tech_res
 
 class MaterialExporter:
-	def __init__(self):
-		self.inline_texture_data = False
-
 	def create_texture_exporter(self):
 		from .export_texture import TextureExporter
 		texture_export = TextureExporter()
-		texture_export.inline_data = self.inline_texture_data
 		return texture_export
 
 	def export_technique_resources(self, material, resources):
@@ -57,19 +70,19 @@ class MaterialExporter:
 		mat_name = material.name+".mat"
 		if mat_name not in resources:
 			if material.type:
-				resources[mat_name] = self.export_material(material, resources=resources)
+				resources[mat_name] = self.export_material(material, resources)
 			else:
 				resources[mat_name] = None
 
-	def export_technique(self, material, *, resources):
+	def export_technique(self, material, resources):
 		return create_technique_resource(material, resources)
 
-	def export_material(self, material, *, resources):
+	def export_material(self, material, resources):
 		from .datafile import Resource, Statement, Token
 		mat_res = Resource(material.name+".mat", "material")
 
 		if material.type!="pbr" and material.type!="unlit":
-			raise Exception("Can't export unknown material type "+material.type)
+			raise Exception("Can't export material {} of unknown type {}".format(material.name, material.type))
 
 		mat_res.statements.append(Statement("type", Token(material.type)));
 		for p in material.properties:
@@ -77,11 +90,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
 
@@ -90,11 +102,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:
@@ -137,5 +145,5 @@ class MaterialAtlasExporter:
 
 			resources[mat_name] = mat_res
 
-	def export_technique(self, material_atlas, *, resources):
+	def export_technique(self, material_atlas, resources):
 		return create_technique_resource(material_atlas, resources)