Use bpy.path.basename instead of a custom function

[libs/gl.git] / blender / io_mspgl / export_material.py

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 617a683f9628ffcbde9e69d5adbd9333efd5452b..4941a5851d1b34592e567f80c08cb33af0e919fd 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -6,12 +6,23 @@ def create_technique_resource(material, resources):
 
        mat_res = resources[material.name+".mat"]
 
+       blend_st = None
+       if material.blend_type=='ALPHA':
+               blend_st = Statement("blend", Token("SRC_ALPHA"), Token("ONE_MINUS_SRC_ALPHA"))
+       elif material.blend_type=='ADDITIVE':
+               blend_st = Statement("blend", Token("ONE"), Token("ONE"))
+       elif material.blend_type=='ADDITIVE_ALPHA':
+               blend_st = Statement("blend", Token("SRC_ALPHA"), Token("ONE"))
+
        if material.render_mode=='CUSTOM':
                for m in material.render_methods:
                        st = Statement("method", m.tag)
                        if mat_res and m.use_material:
                                st.sub.append(tech_res.create_reference_statement("material", mat_res))
 
+                       if m.tag=="blended" and blend_st:
+                               st.sub.append(blend_st)
+
                        shader = m.shader
                        if shader.endswith(".glsl"):
                                shader += ".shader"
@@ -25,13 +36,13 @@ def create_technique_resource(material, resources):
 
                        tech_res.statements.append(st)
        else:
-               base_method = "blended" if material.blended else ""
+               base_method = "blended" if material.blend_type!='NONE' else ""
                st = Statement("method", base_method)
                if mat_res:
                        st.sub.append(tech_res.create_embed_statement("material", mat_res))
 
-               if material.blended:
-                       ss.sub.append(Statement("blend", Token("SRC_ALPHA"), Token("ONE_MINUS_SRC_ALPHA")))
+               if blend_st:
+                       st.sub.append(blend_st)
                if material.receive_shadows:
                        st.sub.append(Statement("receive_shadows", True))
                if material.image_based_lighting:
@@ -51,7 +62,7 @@ def create_technique_resource(material, resources):
        return tech_res
 
 class MaterialExporter:
-       def export_technique_resources(self, material, resources):
+       def export_technique_resources(self, ctx, material, resources):
                from .export_texture import SamplerExporter, TextureExporter
                texture_export = TextureExporter()
                sampler_export = SamplerExporter()
@@ -60,16 +71,21 @@ class MaterialExporter:
                if type(material)!=Material:
                        material = Material(material)
 
-               for p in material.properties:
-                       if p.texture:
-                               tex_name = p.texture.image.name+".tex2d"
-                               if tex_name not in resources:
-                                       resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage, invert_green=p.invert_green)
+               textured_props = [p for p in material.properties if p.texture]
+
+               ctx.set_slices(len(textured_props)+1)
+               for p in textured_props:
+                       ctx.next_slice(p.texture.image)
+
+                       tex_name = p.texture.image.name+".tex"
+                       if tex_name not in resources:
+                               resources[tex_name] = texture_export.export_texture(p.texture, p.tex_channels)
 
-                               samp_name = sampler_export.get_sampler_name(p.texture)
-                               if samp_name not in resources:
-                                       resources[samp_name] = sampler_export.export_sampler(p.texture)
+                       samp_name = sampler_export.get_sampler_name(p.texture)
+                       if samp_name not in resources:
+                               resources[samp_name] = sampler_export.export_sampler(p.texture)
 
+               ctx.next_slice(material)
                mat_name = material.name+".mat"
                if mat_name not in resources:
                        if material.type:
@@ -107,8 +123,7 @@ class MaterialExporter:
        def create_property_statement(self, mat_res, prop, resources):
                from .datafile import Statement
                if prop.texture:
-                       tex_res = resources[prop.texture.image.name+".tex2d"]
-                       from .util import basename
+                       tex_res = resources[prop.texture.image.name+".tex"]
                        return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
                elif not prop.keyword:
                        return
@@ -124,11 +139,12 @@ class MaterialAtlasExporter:
 
        def export_technique_resources(self, material_atlas, resources):
                from .datafile import Resource, Statement, Token
-               base_color_name = material_atlas.name+"_base_color.tex2d"
+               base_color_name = material_atlas.name+"_base_color.tex"
                base_color_res = resources.get(base_color_name)
                if not base_color_res:
-                       base_color_res = Resource(base_color_name, "texture2d")
+                       base_color_res = Resource(base_color_name, "texture")
 
+                       base_color_res.statements.append(Statement("type", Token("\\2d")))
                        base_color_res.statements.append(Statement("storage", Token('SRGB_ALPHA'), *material_atlas.size))
                        base_color_res.statements.append(Statement("raw_data", material_atlas.base_color_data))