Make texture channel handling in the Blender exporter more flexible

[libs/gl.git] / blender / io_mspgl / export_texture.py

diff --git a/blender/io_mspgl/export_texture.py b/blender/io_mspgl/export_texture.py
index 8e3872b5c8646f1084c83324b73f15499c9d9e9a..eb6fa223cf1f8d0f31d903daa5d9ac9229effd7f 100644 (file)
--- 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,41 +11,47 @@ 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 __init__(self):
-               self.inline_data = True
-
-       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 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]=='~')
 
                from .util import basename
                fn = basename(image.filepath)
-               if not self.inline_data and not invert_green and fn:
+               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'
@@ -58,15 +60,17 @@ class TextureExporter:
 
                        pixels = tuple(image.pixels)
                        texdata = ""
-                       if usage=='RGBA':
-                               texdata = encode_pixels(pixels_to_rgba(pixels))
-                       elif usage=='GRAY':
-                               texdata = encode_pixels(pixels_to_gray(pixels))
-                       elif invert_green:
-                               texdata = encode_pixels(pixels_to_rgb_invert_green(pixels))
+                       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:
-                               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