X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=5710e0cec1b998697a92ecf1be01ed37260d1532;hp=0a75c47a761e929bbd5bf1c4485406357b99eb61;hb=d14b33347983d1d0cd608b29b5ee9b7a37d98c5b;hpb=2a0d4c5aa8a6e3cca56fb446ab8e9a0fadc02bd1

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 0a75c47a..5710e0ce 100644
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -28,7 +28,9 @@ class MaterialExporter:
 		return texture_export
 
 	def export_technique_resources(self, material, resources):
+		from .export_texture import SamplerExporter
 		texture_export = self.create_texture_exporter()
+		sampler_export = SamplerExporter()
 
 		from .material import Material
 		material = Material(material)
@@ -40,6 +42,10 @@ class MaterialExporter:
 					if tex_name not in resources:
 						resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage)
 
+					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:
 			resources[mat_name] = self.export_material(material, resources=resources)
@@ -57,6 +63,12 @@ class MaterialExporter:
 		st.sub.append(self.create_property_statement(mat_res, material.roughness, "roughness", resources))
 		st.sub.append(self.create_property_statement(mat_res, material.normal, "normal", resources, tex_only=True))
 		st.sub.append(self.create_property_statement(mat_res, material.emission, "emission", resources))
+		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:
+				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)
 
 		return mat_res
@@ -83,21 +95,30 @@ class MaterialMapExporter:
 	def export_technique_resources(self, material_map, resources):
 		from .datafile import Resource, Statement, Token
 		base_color_name = material_map.name+"_base_color.tex2d"
-		if base_color_name not in resources:
+		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("min_filter", Token('NEAREST')))
-			base_color_res.statements.append(Statement("mag_filter", Token('NEAREST')))
 			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))
 
 			resources[base_color_name] = base_color_res
 
+		sampler_name = "nearest.samp"
+		sampler_res = resources.get(sampler_name)
+		if not sampler_res:
+			sampler_res = Resource(sampler_name, "sampler")
+
+			sampler_res.statements.append(Statement("filter", Token('NEAREST')))
+
+			resources[sampler_name] = sampler_res
+
 		mat_name = material_map.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)
 
 			resources[mat_name] = mat_res