X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_texture.py;h=e03b1b0c9185f09d44fc1a96f0d9ce42678965de;hb=1ced0f1993471e4cf8789186edc57f8f900d9b6c;hp=c304fd7e471ffd344da316712db29b984272ed01;hpb=a85c4fefbffae9a1f754855af6e8dc107bc4b47c;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index c304fd7e..e03b1b0c 100644
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,6 +1,7 @@
 import os
 import base64
 import codecs
+import bpy
 
 def pixels_to_rgba(pixels):
 	return (int(p*255) for p in pixels)
@@ -11,18 +12,21 @@ def pixels_to_rgb(pixels):
 		yield int(pixels[i+1]*255)
 		yield int(pixels[i+2]*255)
 
-def pixels_to_rgb_invert_green(pixels):
+def pixels_to_rgb_invert(pixels, mask):
 	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)
+		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 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):
+	def export_texture(self, tex_node, channels=['R', 'G', 'B']):
 		image = tex_node.image
 		from .datafile import RawData, Resource, Statement, Token
 		tex_res = Resource(image.name+".tex", "texture")
@@ -33,20 +37,21 @@ class TextureExporter:
 			tex_res.statements.append(Statement("generate_mipmap", True))
 
 		colorspace = image.colorspace_settings.name
-		if usage=='GRAY' and colorspace=='sRGB':
+		if len(channels)==1 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:
+		invert_mask = sum(1<<i for i, c in enumerate(channels) if c[0]=='~')
+
+		fn = bpy.path.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'
@@ -55,12 +60,12 @@ class TextureExporter:
 
 			pixels = tuple(image.pixels)
 			texdata = ""
-			if usage=='RGBA':
+			if len(channels)==4:
 				texdata = pixels_to_rgba(pixels)
-			elif usage=='GRAY':
+			elif len(channels)==1:
 				texdata = pixels_to_gray(pixels)
-			elif invert_green:
-				texdata = pixels_to_rgb_invert_green(pixels)
+			elif invert_mask:
+				texdata = pixels_to_rgb_invert(pixels, invert_mask)
 			else:
 				texdata = pixels_to_rgb(pixels)