X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=eb6fa223cf1f8d0f31d903daa5d9ac9229effd7f;hp=2a736b84032e0df7dc76dd008718c9a24233316c;hb=1ebae998eb54c3f33900dc76de3b34c2d5252e58;hpb=d14b33347983d1d0cd608b29b5ee9b7a37d98c5b

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 2a736b84..eb6fa223 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,47 +1,76 @@
 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(pixels, mask):
+	for i in range(0, len(pixels), 4):
+		r = int(pixels[i]*255)
+		yield 255-r if mask&1 else r
+		g = int(pixels[i+1]*255)
+		yield 255-g if mask&2 else g
+		b = int(pixels[i+2]*255)
+		yield 255-b if mask&4 else b
 
-	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, channels=['R', 'G', 'B']):
 		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")
+		if len(channels)==1 and colorspace=='sRGB':
+			raise Exception("Unsupported configuration on texture {}: Grayscale with sRGB".format(image.name))
+
+		invert_mask = sum(1<<i for i, c in enumerate(channels) if c[0]=='~')
 
-		fn = os.path.basename(image.filepath)
-		if not self.inline_data and fn:
+		from .util import basename
+		fn = basename(image.filepath)
+		if not invert_mask and fn:
+			if not tex_node.use_mipmap:
+				tex_res.statements.append(Statement("mipmap_levels", 1))
 			srgb = "_srgb" if colorspace=='sRGB' else ""
 			tex_res.statements.append(Statement("external_image"+srgb, fn))
 		else:
-			if usage=='RGBA':
+			if len(channels)==4:
 				fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
-			elif usage=='GRAY':
+			elif len(channels)==1:
 				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':
-				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])
+			if len(channels)==4:
+				texdata = pixels_to_rgba(pixels)
+			elif len(channels)==1:
+				texdata = pixels_to_gray(pixels)
+			elif invert_mask:
+				texdata = pixels_to_rgb_invert(pixels, invert_mask)
 			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))
+				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
 
@@ -63,6 +92,14 @@ class SamplerExporter:
 			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):
@@ -74,5 +111,7 @@ class SamplerExporter:
 			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"