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

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 2ffb5246..3d21cd1a 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,24 +1,48 @@
 import os
+import base64
+import codecs
 
-class TextureExporter:
-	def __init__(self):
-		self.inline_data = True
+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 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 Resource, Statement, Token
-		tex_res = Resource(image.name+".tex2d", "texture2d")
+		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("Grayscale textures with sRGB colorspace are not supported")
+			raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
 
 		from .util import basename
 		fn = basename(image.filepath)
-		if not self.inline_data and fn:
+		if not invert_green and fn:
 			srgb = "_srgb" if colorspace=='sRGB' else ""
 			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
@@ -31,17 +55,16 @@ class TextureExporter:
 
 			tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
 
+			pixels = tuple(image.pixels)
 			texdata = ""
 			if usage=='RGBA':
-				for p in image.pixels:
-					texdata += "\\x{:02X}".format(int(p*255))
+				texdata = encode_pixels(pixels_to_rgba(pixels))
 			elif usage=='GRAY':
-				for i in range(0, len(image.pixels), 4):
-					texdata += "\\x{:02X}".format(image.pixels[i])
+				texdata = encode_pixels(pixels_to_gray(pixels))
+			elif invert_green:
+				texdata = encode_pixels(pixels_to_rgb_invert_green(pixels))
 			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))
+				texdata = encode_pixels(pixels_to_rgb(pixels))
 			tex_res.statements.append(Statement("raw_data", texdata))
 
 		return tex_res