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

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 6a194dfb..8560984e 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,5 +1,3 @@
-import os
-
 def create_technique_resource(material, resources):
 	from .datafile import Resource, Statement, Token
 	tech_res = Resource(material.name+".tech", "technique")
@@ -7,8 +5,12 @@ def create_technique_resource(material, resources):
 	mat_res = resources[material.name+".mat"]
 
 	blend_st = None
-	if material.blended:
+	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:
@@ -32,7 +34,7 @@ def create_technique_resource(material, resources):
 
 			tech_res.statements.append(st)
 	else:
-		base_method = "blended" if material.blended else ""
+		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))
@@ -58,7 +60,7 @@ 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()
@@ -67,16 +69,21 @@ class MaterialExporter:
 		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)
+
+			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)
+			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:
@@ -114,8 +121,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
@@ -131,11 +137,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))