Simplify exporter creation

[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 d62276f76221bbcf3d89ea3e78aadc6040fd8599..792ab2903576ba4a10518fef480c06cb5cc49ac9 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -7,45 +7,52 @@ def create_technique_resource(material, resources):
 
        mat_res = resources[material.name+".mat"]
 
-       st = Statement("pass", "")
-       if mat_res:
-               st.sub.append(tech_res.create_embed_statement("material", mat_res))
-
        if material.render_mode=='CUSTOM':
-               shader = material.shader
-               if shader.endswith(".glsl"):
-                       shader += ".shader"
-               st.sub.append(Statement("shader", shader))
-
-               if material.uniforms:
-                       ss = Statement("uniforms")
-                       for u in material.uniforms:
-                               ss.sub.append(Statement("uniform", u.name, *u.values[:u.size]))
-                       st.sub.append(ss)
+               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))
+
+                       shader = m.shader
+                       if shader.endswith(".glsl"):
+                               shader += ".shader"
+                       st.sub.append(Statement("shader", shader))
+
+                       if material.uniforms:
+                               ss = Statement("uniforms")
+                               for u in material.uniforms:
+                                       ss.sub.append(Statement("uniform", u.name, *u.values[:u.size]))
+                               st.sub.append(ss)
+
+                       tech_res.statements.append(st)
        else:
-               if material.receive_shadows:
-                       st.sub.append(Statement("receive_shadows", True))
-               if material.image_based_lighting:
-                       st.sub.append(Statement("image_based_lighting", True))
+               st = Statement("method", "")
+               if mat_res:
+                       st.sub.append(tech_res.create_embed_statement("material", mat_res))
 
-       tech_res.statements.append(st)
+               if material.render_mode!='CUSTOM':
+                       if material.receive_shadows:
+                               st.sub.append(Statement("receive_shadows", True))
+                       if material.image_based_lighting:
+                               st.sub.append(Statement("image_based_lighting", True))
 
-       if material.shadow_method!='NONE':
-               st = Statement("pass", "shadow")
-               st.sub.append(Statement("shader", "_occluder.glsl.shader"))
                tech_res.statements.append(st)
 
+               if material.shadow_method!='NONE':
+                       st = Statement("method", "shadow")
+                       st.sub.append(Statement("shader", "occluder.glsl.shader"))
+                       tech_res.statements.append(st)
+
+                       st = Statement("method", "shadow_thsm")
+                       st.sub.append(Statement("shader", "occluder_thsm.glsl.shader"))
+                       tech_res.statements.append(st)
+
        return tech_res
 
 class MaterialExporter:
-       def create_texture_exporter(self):
-               from .export_texture import TextureExporter
-               texture_export = TextureExporter()
-               return texture_export
-
        def export_technique_resources(self, material, resources):
-               from .export_texture import SamplerExporter
-               texture_export = self.create_texture_exporter()
+               from .export_texture import SamplerExporter, TextureExporter
+               texture_export = TextureExporter()
                sampler_export = SamplerExporter()
 
                from .material import Material
@@ -84,11 +91,10 @@ class MaterialExporter:
                        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):
+               if 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)]))
+                       mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
 
                return mat_res
 
@@ -97,11 +103,7 @@ class MaterialExporter:
                if prop.texture:
                        tex_res = resources[prop.texture.image.name+".tex2d"]
                        from .util import basename
-                       fn = basename(prop.texture.image.filepath)
-                       if prop.texture.default_filter and fn:
-                               return Statement(prop.tex_keyword, fn)
-                       else:
-                               return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
+                       return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
                elif not prop.keyword:
                        return
                elif type(prop.value)==tuple: