Improve error reporting in the Blender exporter

[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 f75d8f93ff3623100642f8d6418ab4c3d44a3e88..54b2105492f898e30f8502f936e518b30b983c84 100644 (file)
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,10 +1,32 @@
 import os
+import base64
+import codecs
 
-class TextureExporter:
-       def __init__(self):
-               self.inline_data = True
+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)
+
+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_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 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, usage='RGB', *, invert_green=False):
                image = tex_node.image
                from .datafile import Resource, Statement, Token
                tex_res = Resource(image.name+".tex2d", "texture2d")
@@ -14,11 +36,11 @@ class TextureExporter:
 
                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:
@@ -31,17 +53,16 @@ class TextureExporter:
 
                        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))
+                               texdata = encode_pixels(pixels_to_rgba(pixels))
                        elif usage=='GRAY':
-                               for i in range(0, len(image.pixels), 4):
-                                       texdata += "\\x{:02X}".format(image.pixels[i])
+                               texdata = encode_pixels(pixels_to_gray(pixels))
+                       elif invert_green:
+                               texdata = encode_pixels(pixels_to_rgb_invert_green(pixels))
                        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))
+                               texdata = encode_pixels(pixels_to_rgb(pixels))
                        tex_res.statements.append(Statement("raw_data", texdata))
 
                return tex_res
@@ -64,6 +85,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):
@@ -75,5 +104,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"