Export raw texture data to a separate file

[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 7661b90b2fa5e1d91c5ba0410689904d29681bdb..dc291c9cf64cd0c93a96df939bc0b1fd685bdc36 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)
 
@@ -28,15 +24,17 @@ def pixels_to_gray(pixels):
 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")
+               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)
@@ -56,14 +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 = encode_pixels(pixels_to_rgb_invert_green(pixels))
+                               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