Fix normal map property name in material 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 8c750ab9f73504493d09bd9d9138beba5837eb5e..2ffb5246cf448839c9a594e1accd1397c018da79 100644 (file)
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -1,40 +1,89 @@
+import os
+
 class TextureExporter:
        def __init__(self):
                self.inline_data = True
 
-       def export_texture(self, texture):
+       def export_texture(self, tex_node, usage='RGB'):
+               image = tex_node.image
                from .datafile import Resource, Statement, Token
-               tex_res = Resource(texture.name+".tex2d")
+               tex_res = Resource(image.name+".tex2d", "texture2d")
 
-               if texture.use_interpolation:
-                       if texture.use_mipmap:
-                               tex_res.statements.append(Statement("min_filter", Token('LINEAR_MIPMAP_LINEAR')))
-                               tex_res.statements.append(Statement("generate_mipmap", True))
-                       else:
-                               tex_res.statements.append(Statement("min_filter", Token('LINEAR')))
-                       tex_res.statements.append(Statement("max_anisotropy", texture.filter_eccentricity))
+               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 .util import basename
+               fn = basename(image.filepath)
+               if not self.inline_data and fn:
+                       srgb = "_srgb" if colorspace=='sRGB' else ""
+                       tex_res.statements.append(Statement("external_image"+srgb, fn))
                else:
-                       if texture.use_mipmap:
-                               tex_res.statements.append(Statement("min_filter", Token('NEAREST_MIPMAP_NEAREST')))
-                               tex_res.statements.append(Statement("generate_mipmap", True))
+                       if usage=='RGBA':
+                               fmt = 'SRGB8_ALPHA8' if colorspace=='sRGB' else 'RGBA8'
+                       elif usage=='GRAY':
+                               fmt = 'LUMINANCE8'
                        else:
-                               tex_res.statements.append(Statement("min_filter", Token('NEAREST')))
+                               fmt = 'SRGB8' if colorspace=='sRGB' else 'RGB8'
+
+                       tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
 
-               if not self.inline_data:
-                       from .util import image_name
-                       tex_res.statements.append(Statement("external_image", image_name(texture.image)))
-               else:
                        texdata = ""
-                       if texture.use_alpha:
-                               fmt = 'RGBA'
-                               for p in texture.image.pixels:
+                       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])
                        else:
-                               fmt = 'RGB'
-                               for i in range(0, len(texture.image.pixels), 4):
+                               for i in range(0, len(image.pixels), 4):
                                        for j in range(3):
-                                               texdata += "\\x{:02X}".format(int(texture.image.pixels[i+j]*255))
-                       tex_res.statements.append(Statement("storage", Token(fmt), texture.image.size[0], texture.image.size[1]))
+                                               texdata += "\\x{:02X}".format(int(image.pixels[i+j]*255))
                        tex_res.statements.append(Statement("raw_data", texdata))
 
                return tex_res
+
+class SamplerExporter:
+       def export_sampler(self, tex_node):
+               from .datafile import Resource, Statement, Token
+               samp_res = Resource(self.get_sampler_name(tex_node), "sampler")
+
+               use_interpolation = tex_node.interpolation!='Closest'
+               if use_interpolation:
+                       if tex_node.use_mipmap:
+                               samp_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
+                       else:
+                               samp_res.statements.append(Statement("filter", Token('LINEAR')))
+                       samp_res.statements.append(Statement("max_anisotropy", tex_node.max_anisotropy))
+               else:
+                       if tex_node.use_mipmap:
+                               samp_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
+                       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):
+               name_parts = []
+
+               use_interpolation = tex_node.interpolation!='Closest'
+               name_parts.append("linear" if use_interpolation else "nearest")
+               if tex_node.use_mipmap:
+                       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"