Check the flat qualifier from the correct member

[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 2ffb5246cf448839c9a594e1accd1397c018da79..2269e27ae175a514670c70a295aaada994228dbb 100644 (file)
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,51 +1,95 @@
 import os
+import bpy
 
-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 pixels_to_gray(pixels):
+       for i in range(0, len(pixels), 4):
+               yield int((pixels[i]+pixels[i+1]+pixels[i+2])*255/3)
 
-       def export_texture(self, tex_node, usage='RGB'):
+def pixels_to_single_channel(pixels, channel):
+       for i in range(0, len(pixels), 4):
+               yield int(pixels[i+channel]*255)
+
+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(self.get_texture_name(tex_node, channels), "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")
+               from .texture import Texture
+               texture = Texture(tex_node, channels)
+
+               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 fn:
-                       srgb = "_srgb" if colorspace=='sRGB' else ""
+               fn = bpy.path.basename(image.filepath)
+               native_channels = None
+               if fn:
+                       abs_path = bpy.path.abspath(image.filepath) 
+                       if os.path.exists(abs_path):
+                               import imbuf
+                               native_bpp = imbuf.load(bpy.path.abspath(image.filepath)).planes
+                               if native_bpp==32:
+                                       native_channels = ['R', 'G', 'B', 'A']
+                               elif native_bpp==24:
+                                       native_channels = ['R', 'G', 'B']
+                               elif native_bpp==8:
+                                       native_channels = ['Y']
+
+               if not invert_mask and channels==native_channels:
+                       if not tex_node.use_mipmap:
+                               tex_res.statements.append(Statement("mipmap_levels", 1))
+                       srgb = "_srgb" if texture.srgb else ""
                        tex_res.statements.append(Statement("external_image"+srgb, fn))
                else:
-                       if usage=='RGBA':
-                               fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
-                       elif usage=='GRAY':
-                               fmt = 'LUMINANCE8'
-                       else:
-                               fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
-
-                       tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
+                       tex_res.statements.append(Statement("storage", Token(texture.pixelformat), texture.width, texture.height))
 
+                       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:
+                               if channels[0]=='Y':
+                                       texdata = pixels_to_gray(pixels)
+                               else:
+                                       texdata = pixels_to_single_channel(pixels, "RGBA".index(channels[0]))
+                       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(os.path.splitext(tex_res.name)[0]+".mdr", bytes(texdata))
+                       tex_res.statements.append(tex_res.create_reference_statement("external_data", data))
 
                return tex_res
 
+       def get_texture_name(self, tex_node, channels):
+               image_name = tex_node.image.name
+               if len(channels)==1 and channels[0]!='Y':
+                       image_name += "_"+channels[0]
+               return image_name+".tex"
+
 class SamplerExporter:
        def export_sampler(self, tex_node):
                from .datafile import Resource, Statement, Token