X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=dc291c9cf64cd0c93a96df939bc0b1fd685bdc36;hb=16ff00bce699d09cc89e4280a97b097c59e7e475;hp=3b2201302ee1aaa0854e2a77468f496b171e260d;hpb=180b20bee11425a776c5ead05afcf6a63945d3b2;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 3b220130..dc291c9c 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,56 +1,110 @@
 import os
+import base64
+import codecs
 
-class TextureExporter:
-	def __init__(self):
-		self.inline_data = True
+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 export_texture(self, tex_node, usage='RGB'):
+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)
+
+class TextureExporter:
+	def export_texture(self, tex_node, usage='RGB', *, invert_green=False):
 		image = tex_node.image
+		from .datafile import RawData, Resource, Statement, Token
+		tex_res = Resource(image.name+".tex", "texture")
+
+		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 usage=='RGBA':
+				fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
+			elif usage=='GRAY':
+				fmt = 'LUMINANCE8'
+			else:
+				fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
+
+			tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+
+			pixels = tuple(image.pixels)
+			texdata = ""
+			if usage=='RGBA':
+				texdata = pixels_to_rgba(pixels)
+			elif usage=='GRAY':
+				texdata = pixels_to_gray(pixels)
+			elif invert_green:
+				texdata = pixels_to_rgb_invert_green(pixels)
+			else:
+				texdata = pixels_to_rgb(pixels)
+
+			data = RawData(image.name+".mdr", bytes(texdata))
+			tex_res.statements.append(tex_res.create_reference_statement("external_data", data))
+
+		return tex_res
+
+class SamplerExporter:
+	def export_sampler(self, tex_node):
 		from .datafile import Resource, Statement, Token
-		tex_res = Resource(image.name+".tex2d")
+		samp_res = Resource(self.get_sampler_name(tex_node), "sampler")
 
 		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))
+				samp_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
 			else:
-				tex_res.statements.append(Statement("filter", Token('LINEAR')))
-			tex_res.statements.append(Statement("max_anisotropy", tex_node.max_anisotropy))
+				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:
-				tex_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
-				tex_res.statements.append(Statement("generate_mipmap", True))
+				samp_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
 			else:
-				tex_res.statements.append(Statement("filter", Token('NEAREST')))
+				samp_res.statements.append(Statement("filter", Token('NEAREST')))
 
-		colorspace = image.colorspace_settings.name
-		if usage=='RGBA':
-			fmt = 'SRGB_ALPHA' if colorspace=='sRGB' else 'RGBA'
-		elif usage=='GRAY':
-			if colorspace=='sRGB':
-				raise Exception("Grayscale textures with sRGB colorspace are not supported")
-			fmt = 'LUMINANCE'
-		else:
-			fmt = 'SRGB' if colorspace=='sRGB' else 'RGB'
+		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))
 
-		tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+		return samp_res
 
-		fn = os.path.basename(image.filepath)
-		if not self.inline_data and fn:
-			tex_res.statements.append(Statement("external_image", fn))
-		else:
-			texdata = ""
-			if usage=='RGBA':
-				for p in image.pixels:
-					texdata += "\\x{:02X}".format(int(p*255))
-			elif usage=='GRAY':
-				for i in range(0, len(image.pixels), 4):
-					texdata += "\\x{:02X}".format(image.pixels[i])
-			else:
-				for i in range(0, len(image.pixels), 4):
-					for j in range(3):
-						texdata += "\\x{:02X}".format(int(image.pixels[i+j]*255))
-			tex_res.statements.append(Statement("raw_data", texdata))
+	def get_sampler_name(self, tex_node):
+		name_parts = []
 
-		return tex_res
+		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"