Revise export function parameter orders

[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 c7ca765cb0736c9387c5742b0b9e76a3f0e7c106..6abd78c2d05b8157a429405c02e8ad208a772448 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -28,7 +28,6 @@ def create_technique_resource(material, resources):
 
 class MaterialExporter:
        def __init__(self):
-               self.use_textures = True
                self.inline_texture_data = False
 
        def create_texture_exporter(self):
@@ -45,52 +44,50 @@ class MaterialExporter:
                from .material import Material
                material = Material(material)
 
-               if self.use_textures:
-                       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)
+               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)
 
-                                       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)
 
                mat_name = material.name+".mat"
                if mat_name not in resources:
                        if material.type:
-                               resources[mat_name] = self.export_material(material, resources=resources)
+                               resources[mat_name] = self.export_material(material, resources)
                        else:
                                resources[mat_name] = None
 
-       def export_technique(self, material, *, resources):
+       def export_technique(self, material, resources):
                return create_technique_resource(material, resources)
 
-       def export_material(self, material, *, resources):
-               from .datafile import Resource, Statement
+       def export_material(self, material, resources):
+               from .datafile import Resource, Statement, Token
                mat_res = Resource(material.name+".mat", "material")
 
                if material.type!="pbr" and material.type!="unlit":
                        raise Exception("Can't export unknown material type "+material.type)
 
-               st = Statement(material.type)
+               mat_res.statements.append(Statement("type", Token(material.type)));
                for p in material.properties:
-                       ss = self.create_property_statement(mat_res, p, resources)
-                       if ss:
-                               st.sub.append(ss)
-               if self.use_textures:
-                       textures = [p.texture for p in material.properties if p.texture]
-                       if textures and not textures[0].default_filter:
-                               from .export_texture import SamplerExporter
-                               sampler_export = SamplerExporter()
-                               st.sub.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
-               mat_res.statements.append(st)
+                       st = self.create_property_statement(mat_res, p, resources)
+                       if st:
+                               mat_res.statements.append(st)
+               textures = [p.texture for p in material.properties if p.texture]
+               if textures and not all(t.default_filter for t in textures):
+                       from .export_texture import SamplerExporter
+                       sampler_tex = next(t for t in textures if not t.default_filter)
+                       sampler_export = SamplerExporter()
+                       mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(sampler_tex)]))
 
                return mat_res
 
        def create_property_statement(self, mat_res, prop, resources):
                from .datafile import Statement
-               if self.use_textures and prop.texture:
+               if prop.texture:
                        tex_res = resources[prop.texture.image.name+".tex2d"]
                        from .util import basename
                        fn = basename(prop.texture.image.filepath)
@@ -134,12 +131,11 @@ class MaterialAtlasExporter:
                mat_name = material_atlas.name+".mat"
                if mat_name not in resources:
                        mat_res = Resource(mat_name, "material")
-                       st = Statement("pbr")
-                       st.sub.append(mat_res.create_reference_statement("base_color_map", base_color_res))
-                       st.sub.append(mat_res.create_reference_statement("sampler", sampler_res))
-                       mat_res.statements.append(st)
+                       mat_res.statements.append(Statement("type", Token('pbr')))
+                       mat_res.statements.append(mat_res.create_reference_statement("base_color_map", base_color_res))
+                       mat_res.statements.append(mat_res.create_reference_statement("sampler", sampler_res))
 
                        resources[mat_name] = mat_res
 
-       def export_technique(self, material_atlas, *, resources):
+       def export_technique(self, material_atlas, resources):
                return create_technique_resource(material_atlas, resources)