Remove default sampler from Texture

[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 10be7dcba60057665792b7291ab550122901e3e7..8a87011a25d93d1c54bb376c05ba02473488ab3e 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -1,6 +1,7 @@
 import os
 
 def create_technique_resource(material, resources):
+       # This operates on a Blender material, not a custom object
        from .datafile import Resource, Statement
        tech_res = Resource(material.name+".tech", "technique")
 
@@ -21,20 +22,31 @@ def create_technique_resource(material, resources):
                        for u in material.uniforms:
                                ss.sub.append(Statement("uniform", u.name, *u.values[:u.size]))
                        st.sub.append(ss)
+       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))
 
        tech_res.statements.append(st)
 
+       if material.shadow_method!='NONE':
+               st = Statement("pass", "shadow")
+               if material.render_mode=='CUSTOM':
+                       shader = material.shadow_shader or material.shader
+                       if shader.endswith(".glsl"):
+                               shader += ".shader"
+                       st.sub.append(Statement("shader", shader))
+               else:
+                       st.sub.append(Statement("shader", "_occluder.glsl.shader"))
+               tech_res.statements.append(st)
+
        return tech_res
 
 class MaterialExporter:
-       def __init__(self):
-               self.use_textures = True
-               self.inline_texture_data = False
-
        def create_texture_exporter(self):
                from .export_texture import TextureExporter
                texture_export = TextureExporter()
-               texture_export.inline_data = self.inline_texture_data
                return texture_export
 
        def export_technique_resources(self, material, resources):
@@ -45,58 +57,52 @@ 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):
+       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)
+                       raise Exception("Can't export material {} of unknown type {}".format(material.name, material.type))
 
                mat_res.statements.append(Statement("type", Token(material.type)));
                for p in material.properties:
                        st = self.create_property_statement(mat_res, p, resources)
                        if st:
                                mat_res.statements.append(st)
-               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()
-                               mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
+               textures = [p.texture for p in material.properties if p.texture]
+               if textures:
+                       from .export_texture import SamplerExporter
+                       sampler_export = SamplerExporter()
+                       mat_res.statements.append(mat_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(textures[0])]))
 
                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)
-                       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:
@@ -139,5 +145,5 @@ class MaterialAtlasExporter:
 
                        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)