Export texture sampling settings as sampler objects

[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 3b2201302ee1aaa0854e2a77468f496b171e260d..2a736b84032e0df7dc76dd008718c9a24233316c 100644 (file)
--- a/blender/io_mspgl/export_texture.py
+++ b/blender/io_mspgl/export_texture.py
@@ -7,39 +7,29 @@ class TextureExporter:
        def export_texture(self, tex_node, usage='RGB'):
                image = tex_node.image
                from .datafile import Resource, Statement, Token
-               tex_res = Resource(image.name+".tex2d")
+               tex_res = Resource(image.name+".tex2d", "texture2d")
 
-               use_interpolation = tex_node.interpolation!='Closest'
-               if use_interpolation:
-                       if tex_node.use_mipmap:
-                               tex_res.statements.append(Statement("filter", Token('LINEAR_MIPMAP_LINEAR')))
-                               tex_res.statements.append(Statement("generate_mipmap", True))
-                       else:
-                               tex_res.statements.append(Statement("filter", Token('LINEAR')))
-                       tex_res.statements.append(Statement("max_anisotropy", tex_node.max_anisotropy))
-               else:
-                       if tex_node.use_mipmap:
-                               tex_res.statements.append(Statement("filter", Token('NEAREST_MIPMAP_NEAREST')))
-                               tex_res.statements.append(Statement("generate_mipmap", True))
-                       else:
-                               tex_res.statements.append(Statement("filter", Token('NEAREST')))
+               if tex_node.use_mipmap:
+                       tex_res.statements.append(Statement("generate_mipmap", True))
 
                colorspace = image.colorspace_settings.name
-               if usage=='RGBA':
-                       fmt = 'SRGB_ALPHA' if colorspace=='sRGB' else 'RGBA'
-               elif usage=='GRAY':
-                       if colorspace=='sRGB':
+               if usage=='GRAY' and colorspace=='sRGB':
                                raise Exception("Grayscale textures with sRGB colorspace are not supported")
-                       fmt = 'LUMINANCE'
-               else:
-                       fmt = 'SRGB' if colorspace=='sRGB' else 'RGB'
-
-               tex_res.statements.append(Statement("storage", Token(fmt), image.size[0], image.size[1]))
 
                fn = os.path.basename(image.filepath)
                if not self.inline_data and fn:
-                       tex_res.statements.append(Statement("external_image", fn))
+                       srgb = "_srgb" if colorspace=='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]))
+
                        texdata = ""
                        if usage=='RGBA':
                                for p in image.pixels:
@@ -54,3 +44,35 @@ class TextureExporter:
                        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')))
+
+               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))
+
+               return "_".join(name_parts)+".samp"