X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=2ffb5246cf448839c9a594e1accd1397c018da79;hb=b9ba5757a3d139234b5445945b32eae4471724b7;hp=3e78a4cd6ee33af497f4cde7d6a27f281490982c;hpb=2a0d4c5aa8a6e3cca56fb446ab8e9a0fadc02bd1;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 3e78a4cd..2ffb5246 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -9,26 +9,15 @@ class TextureExporter:
 		from .datafile import Resource, Statement, Token
 		tex_res = Resource(image.name+".tex2d", "texture2d")
 
-		use_interpolation = tex_node.interpolation!='Closest'
-		if use_interpolation:
-			if tex_node.use_mipmap:
-				tex_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
-				tex_res.statements.append(Statement("generate_mipmap", True))
-			else:
-				tex_res.statements.append(Statement("filter", Token('LINEAR')))
-			tex_res.statements.append(Statement("max_anisotropy", tex_node.max_anisotropy))
-		else:
-			if tex_node.use_mipmap:
-				tex_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
-				tex_res.statements.append(Statement("generate_mipmap", True))
-			else:
-				tex_res.statements.append(Statement("filter", Token('NEAREST')))
+		if tex_node.use_mipmap:
+			tex_res.statements.append(Statement("generate_mipmap", True))
 
 		colorspace = image.colorspace_settings.name
 		if usage=='GRAY' and colorspace=='sRGB':
 				raise Exception("Grayscale textures with sRGB colorspace are not supported")
 
-		fn = os.path.basename(image.filepath)
+		from .util import basename
+		fn = basename(image.filepath)
 		if not self.inline_data and fn:
 			srgb = "_srgb" if colorspace=='sRGB' else ""
 			tex_res.statements.append(Statement("external_image"+srgb, fn))
@@ -56,3 +45,45 @@ class TextureExporter:
 			tex_res.statements.append(Statement("raw_data", texdata))
 
 		return tex_res
+
+class SamplerExporter:
+	def export_sampler(self, tex_node):
+		from .datafile import Resource, Statement, Token
+		samp_res = Resource(self.get_sampler_name(tex_node), "sampler")
+
+		use_interpolation = tex_node.interpolation!='Closest'
+		if use_interpolation:
+			if tex_node.use_mipmap:
+				samp_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
+			else:
+				samp_res.statements.append(Statement("filter", Token('LINEAR')))
+			samp_res.statements.append(Statement("max_anisotropy", tex_node.max_anisotropy))
+		else:
+			if tex_node.use_mipmap:
+				samp_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
+			else:
+				samp_res.statements.append(Statement("filter", Token('NEAREST')))
+
+		if tex_node.extension=="REPEAT":
+			samp_res.statements.append(Statement("wrap", Token('REPEAT')))
+		elif tex_node.extension=="EXTEND":
+			samp_res.statements.append(Statement("wrap", Token('CLAMP_TO_EDGE')))
+		elif tex_node.extension=="CLIP":
+			samp_res.statements.append(Statement("wrap", Token('CLAMP_TO_BORDER')))
+			samp_res.statements.append(Statement("border_color", 0.0, 0.0, 0.0, 0.0))
+
+		return samp_res
+
+	def get_sampler_name(self, tex_node):
+		name_parts = []
+
+		use_interpolation = tex_node.interpolation!='Closest'
+		name_parts.append("linear" if use_interpolation else "nearest")
+		if tex_node.use_mipmap:
+			name_parts.append("mip")
+		if use_interpolation and tex_node.max_anisotropy>1:
+			name_parts.append("aniso{:g}x".format(tex_node.max_anisotropy))
+		if tex_node.extension!="REPEAT":
+			name_parts.append("clip" if tex_node.extension=="CLIP" else "clamp")
+
+		return "_".join(name_parts)+".samp"