X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=10be7dcba60057665792b7291ab550122901e3e7;hp=1df5347098571a3a84d25db46f1df91c3626d229;hb=a4b9ae04a0a89bb2cf3ab4235d7376d3ff70af7b;hpb=401f74574e55fd9e490eaa4f16f1cc97d0603513

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 1df53470..10be7dcb 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -16,6 +16,12 @@ 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
@@ -61,24 +67,23 @@ class MaterialExporter:
 		return create_technique_resource(material, resources)
 
 	def export_material(self, material, *, resources):
-		from .datafile import Resource, Statement
+		from .datafile import Resource, Statement, Token
 		mat_res = Resource(material.name+".mat", "material")
 
-		if material.type!="pbr":
+		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)
+			st = self.create_property_statement(mat_res, p, resources)
+			if st:
+				mat_res.statements.append(st)
 		if self.use_textures:
-			first_tex = (p.texture for p in material.properties if p.texture).__next__()
-			if first_tex and not first_tex.default_filter:
+			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(first_tex)]))
-		mat_res.statements.append(st)
+				mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
 
 		return mat_res
 
@@ -100,19 +105,19 @@ class MaterialExporter:
 			return Statement(prop.keyword, prop.value)
 
 
-class MaterialMapExporter:
+class MaterialAtlasExporter:
 	def __init__(self):
 		pass
 
-	def export_technique_resources(self, material_map, resources):
+	def export_technique_resources(self, material_atlas, resources):
 		from .datafile import Resource, Statement, Token
-		base_color_name = material_map.name+"_base_color.tex2d"
+		base_color_name = material_atlas.name+"_base_color.tex2d"
 		base_color_res = resources.get(base_color_name)
 		if not base_color_res:
 			base_color_res = Resource(base_color_name, "texture2d")
 
-			base_color_res.statements.append(Statement("storage", Token('SRGB_ALPHA'), *material_map.size))
-			base_color_res.statements.append(Statement("raw_data", material_map.base_color_data))
+			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))
 
 			resources[base_color_name] = base_color_res
 
@@ -125,15 +130,14 @@ class MaterialMapExporter:
 
 			resources[sampler_name] = sampler_res
 
-		mat_name = material_map.name+".mat"
+		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_map, *, resources):
-		return create_technique_resource(material_map, resources)
+	def export_technique(self, material_atlas, *, resources):
+		return create_technique_resource(material_atlas, resources)