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

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 6ec13ead..dc291c9c 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -2,10 +2,6 @@ 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)
 
@@ -15,29 +11,34 @@ def pixels_to_rgb(pixels):
 		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)
 
 class TextureExporter:
-	def __init__(self):
-		self.inline_data = True
-
-	def export_texture(self, tex_node, usage='RGB'):
+	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")
+		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("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:
@@ -53,12 +54,16 @@ class TextureExporter:
 			pixels = tuple(image.pixels)
 			texdata = ""
 			if usage=='RGBA':
-				texdata = encode_pixels(pixels_to_rgba(pixels))
+				texdata = pixels_to_rgba(pixels)
 			elif usage=='GRAY':
-				texdata = encode_pixels(pixels_to_gray(pixels))
+				texdata = pixels_to_gray(pixels)
+			elif invert_green:
+				texdata = pixels_to_rgb_invert_green(pixels)
 			else:
-				texdata = encode_pixels(pixels_to_rgb(pixels))
-			tex_res.statements.append(Statement("raw_data", texdata))
+				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