X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=4941a5851d1b34592e567f80c08cb33af0e919fd;hb=1ced0f1993471e4cf8789186edc57f8f900d9b6c;hp=792ab2903576ba4a10518fef480c06cb5cc49ac9;hpb=3e4e6a2c15b5a61f6e713e12290cd10e82b20513;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 792ab290..4941a585 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,18 +1,28 @@
 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"]
 
+	blend_st = None
+	if material.blend_type=='ALPHA':
+		blend_st = Statement("blend", Token("SRC_ALPHA"), Token("ONE_MINUS_SRC_ALPHA"))
+	elif material.blend_type=='ADDITIVE':
+		blend_st = Statement("blend", Token("ONE"), Token("ONE"))
+	elif material.blend_type=='ADDITIVE_ALPHA':
+		blend_st = Statement("blend", Token("SRC_ALPHA"), Token("ONE"))
+
 	if material.render_mode=='CUSTOM':
 		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"
@@ -26,19 +36,21 @@ def create_technique_resource(material, resources):
 
 			tech_res.statements.append(st)
 	else:
-		st = Statement("method", "")
+		base_method = "blended" if material.blend_type!='NONE' else ""
+		st = Statement("method", base_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))
+		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':
+		if material.cast_shadows:
 			st = Statement("method", "shadow")
 			st.sub.append(Statement("shader", "occluder.glsl.shader"))
 			tech_res.statements.append(st)
@@ -50,24 +62,30 @@ def create_technique_resource(material, resources):
 	return tech_res
 
 class MaterialExporter:
-	def export_technique_resources(self, material, resources):
+	def export_technique_resources(self, ctx, material, resources):
 		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:
-				tex_name = p.texture.image.name+".tex2d"
-				if tex_name not in resources:
-					resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage, invert_green=p.invert_green)
+		textured_props = [p for p in material.properties if p.texture]
+
+		ctx.set_slices(len(textured_props)+1)
+		for p in textured_props:
+			ctx.next_slice(p.texture.image)
 
-				samp_name = sampler_export.get_sampler_name(p.texture)
-				if samp_name not in resources:
-					resources[samp_name] = sampler_export.export_sampler(p.texture)
+			tex_name = p.texture.image.name+".tex"
+			if tex_name not in resources:
+				resources[tex_name] = texture_export.export_texture(p.texture, p.tex_channels)
 
+			samp_name = sampler_export.get_sampler_name(p.texture)
+			if samp_name not in resources:
+				resources[samp_name] = sampler_export.export_sampler(p.texture)
+
+		ctx.next_slice(material)
 		mat_name = material.name+".mat"
 		if mat_name not in resources:
 			if material.type:
@@ -76,6 +94,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):
@@ -101,8 +123,7 @@ class MaterialExporter:
 	def create_property_statement(self, mat_res, prop, resources):
 		from .datafile import Statement
 		if prop.texture:
-			tex_res = resources[prop.texture.image.name+".tex2d"]
-			from .util import basename
+			tex_res = resources[prop.texture.image.name+".tex"]
 			return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
 		elif not prop.keyword:
 			return
@@ -118,11 +139,12 @@ class MaterialAtlasExporter:
 
 	def export_technique_resources(self, material_atlas, resources):
 		from .datafile import Resource, Statement, Token
-		base_color_name = material_atlas.name+"_base_color.tex2d"
+		base_color_name = material_atlas.name+"_base_color.tex"
 		base_color_res = resources.get(base_color_name)
 		if not base_color_res:
-			base_color_res = Resource(base_color_name, "texture2d")
+			base_color_res = Resource(base_color_name, "texture")
 
+			base_color_res.statements.append(Statement("type", Token("\\2d")))
 			base_color_res.statements.append(Statement("storage", Token('SRGB_ALPHA'), *material_atlas.size))
 			base_color_res.statements.append(Statement("raw_data", material_atlas.base_color_data))