X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=3d21cd1a796a77d540cda19ff72ba39179509ea6;hb=be92396630a2065e43c21d9d1904e97014844cff;hp=1cf32afeb59072a58f67fc4fe8b529b8549cd522;hpb=f77259ba680e73daee6008f53dafe92e84a0b5f5;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 1cf32afe..3d21cd1a 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,40 +1,112 @@
-class TextureExporter:
-	def __init__(self):
-		self.inline_data = True
+import os
+import base64
+import codecs
+
+def encode_pixels(pixels):
+	from .datafile import Token
+	return Token(codecs.decode(b"="+base64.b64encode(bytes(pixels))+b"=", "ascii"))
+
+def pixels_to_rgba(pixels):
+	return (int(p*255) for p in pixels)
+
+def pixels_to_rgb(pixels):
+	for i in range(0, len(pixels), 4):
+		yield int(pixels[i]*255)
+		yield int(pixels[i+1]*255)
+		yield int(pixels[i+2]*255)
+
+def pixels_to_rgb_invert_green(pixels):
+	for i in range(0, len(pixels), 4):
+		yield int(pixels[i]*255)
+		yield 255-int(pixels[i+1]*255)
+		yield int(pixels[i+2]*255)
+
+def pixels_to_gray(pixels):
+	for i in range(0, len(pixels), 4):
+		yield int((pixels[i]+pixels[i+1]+pixels[i+2])*255/3)
 
-	def export_texture(self, texture):
+class TextureExporter:
+	def export_texture(self, tex_node, usage='RGB', *, invert_green=False):
+		image = tex_node.image
 		from .datafile import Resource, Statement, Token
-		tex_res = Resource(texture.name+".tex2d")
+		tex_res = Resource(image.name+".tex", "texture")
 
-		if texture.use_interpolation:
-			if texture.use_mipmap:
-				tex_res.statements.append(Statement("min_filter", Token('LINEAR_MIPMAP_LINEAR')))
-				tex_res.statements.append(Statement("generate_mipmap", True))
-			else:
-				tex_res.statements.append(Statement("min_filter", Token('LINEAR')))
-			tex_res.statements.append(Statement("max_anisotropy", texture.filter_eccentricity))
+		tex_res.statements.append(Statement("type", Token("\\2d")))
+
+		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("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
+
+		from .util import basename
+		fn = basename(image.filepath)
+		if not invert_green and fn:
+			srgb = "_srgb" if colorspace=='sRGB' else ""
+			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
-			if texture.use_mipmap:
-				tex_res.statements.append(Statement("min_filter", Token('NEAREST_MIPMAP_NEAREST')))
-				tex_res.statements.append(Statement("generate_mipmap", True))
+			if usage=='RGBA':
+				fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
+			elif usage=='GRAY':
+				fmt = 'LUMINANCE8'
 			else:
-				tex_res.statements.append(Statement("min_filter", Token('NEAREST')))
+				fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
 
-		if not self.inline_data:
-			from .util import image_name
-			tex_res.statements.append(Statement("image_data", image_name(texture.image)))
-		else:
+			tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+
+			pixels = tuple(image.pixels)
 			texdata = ""
-			if texture.use_alpha:
-				fmt = 'RGBA'
-				for p in texture.image.pixels:
-					texdata += "\\x{:02X}".format(int(p*255))
+			if usage=='RGBA':
+				texdata = encode_pixels(pixels_to_rgba(pixels))
+			elif usage=='GRAY':
+				texdata = encode_pixels(pixels_to_gray(pixels))
+			elif invert_green:
+				texdata = encode_pixels(pixels_to_rgb_invert_green(pixels))
 			else:
-				fmt = 'RGB'
-				for i in range(0, len(texture.image.pixels), 4):
-					for j in range(3):
-						texdata += "\\x{:02X}".format(int(texture.image.pixels[i+j]*255))
-			tex_res.statements.append(Statement("storage", Token(fmt), texture.image.size[0], texture.image.size[1]))
+				texdata = encode_pixels(pixels_to_rgb(pixels))
 			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"