X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=blender%2Fio_mspgl%2Fexport_material.py;h=b0df347f7fb0a2af9f07014e16a60bd2023afae8;hb=893c0645802c46eb60b04a87e79a5a4d69e32ea2;hp=826ab92688429e69cf5b735c06227674fa8fbd64;hpb=9656026f49b0063e035825fec2a96e17b6de93af;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 826ab926..b0df347f 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")
@@ -62,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()
@@ -71,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 = texture_export.get_texture_name(p.texture, p.tex_channels)
+			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:
@@ -118,8 +121,9 @@ 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
+			from .export_texture import TextureExporter
+			texture_export = TextureExporter()
+			tex_res = resources[texture_export.get_texture_name(prop.texture, prop.tex_channels)]
 			return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
 		elif not prop.keyword:
 			return
@@ -135,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))