X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=6abd78c2d05b8157a429405c02e8ad208a772448;hb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;hp=5411280d3832596616ace8ea36608fd85e55dedc;hpb=5bf3c7175c359ad8509702a4e0790609b39e6aec;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 5411280d..6abd78c2 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -16,13 +16,18 @@ def create_technique_resource(material, resources):
 			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)
 
 	return tech_res
 
 class MaterialExporter:
 	def __init__(self):
-		self.use_textures = True
 		self.inline_texture_data = False
 
 	def create_texture_exporter(self):
@@ -39,52 +44,50 @@ class MaterialExporter:
 		from .material import Material
 		material = Material(material)
 
-		if self.use_textures:
-			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)
+		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)
 
-					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)
 
 		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):
-		from .datafile import Resource, Statement
+	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)
 
-		st = Statement(material.type)
+		mat_res.statements.append(Statement("type", Token(material.type)));
 		for p in material.properties:
-			ss = self.create_property_statement(mat_res, p, resources)
-			if ss:
-				st.sub.append(ss)
-		if self.use_textures:
-			textures = [p.texture for p in material.properties if p.texture]
-			if textures and not textures[0].default_filter:
-				from .export_texture import SamplerExporter
-				sampler_export = SamplerExporter()
-				st.sub.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
-		mat_res.statements.append(st)
+			st = self.create_property_statement(mat_res, p, resources)
+			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):
+			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)]))
 
 		return mat_res
 
 	def create_property_statement(self, mat_res, prop, resources):
 		from .datafile import Statement
-		if self.use_textures and prop.texture:
+		if prop.texture:
 			tex_res = resources[prop.texture.image.name+".tex2d"]
 			from .util import basename
 			fn = basename(prop.texture.image.filepath)
@@ -128,12 +131,11 @@ class MaterialAtlasExporter:
 		mat_name = material_atlas.name+".mat"
 		if mat_name not in resources:
 			mat_res = Resource(mat_name, "material")
-			st = Statement("pbr")
-			st.sub.append(mat_res.create_reference_statement("base_color_map", base_color_res))
-			st.sub.append(mat_res.create_reference_statement("sampler", sampler_res))
-			mat_res.statements.append(st)
+			mat_res.statements.append(Statement("type", Token('pbr')))
+			mat_res.statements.append(mat_res.create_reference_statement("base_color_map", base_color_res))
+			mat_res.statements.append(mat_res.create_reference_statement("sampler", sampler_res))
 
 			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)