X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=1df5347098571a3a84d25db46f1df91c3626d229;hb=401f74574e55fd9e490eaa4f16f1cc97d0603513;hp=0a75c47a761e929bbd5bf1c4485406357b99eb61;hpb=a25ac71f574649a95cf7f05f3ccad1b5d8ef2655;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py index 0a75c47a..1df53470 100644 --- a/blender/io_mspgl/export_material.py +++ b/blender/io_mspgl/export_material.py @@ -7,10 +7,14 @@ def create_technique_resource(material, resources): mat_res = resources[material.name+".mat"] st = Statement("pass", "") - st.sub.append(tech_res.create_embed_statement("material", mat_res)) + if mat_res: + st.sub.append(tech_res.create_embed_statement("material", mat_res)) if material.render_mode=='CUSTOM': - st.sub.append(Statement("shader", material.shader)) + shader = material.shader + if shader.endswith(".glsl"): + shader += ".shader" + st.sub.append(Statement("shader", shader)) tech_res.statements.append(st) @@ -28,7 +32,9 @@ class MaterialExporter: return texture_export def export_technique_resources(self, material, resources): + from .export_texture import SamplerExporter texture_export = self.create_texture_exporter() + sampler_export = SamplerExporter() from .material import Material material = Material(material) @@ -40,9 +46,16 @@ class MaterialExporter: if tex_name not in resources: resources[tex_name] = texture_export.export_texture(p.texture, p.tex_usage) + 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: - resources[mat_name] = self.export_material(material, resources=resources) + if material.type: + resources[mat_name] = self.export_material(material, resources=resources) + else: + resources[mat_name] = None def export_technique(self, material, *, resources): return create_technique_resource(material, resources) @@ -51,29 +64,40 @@ class MaterialExporter: from .datafile import Resource, Statement mat_res = Resource(material.name+".mat", "material") - st = Statement("pbr") - st.sub.append(self.create_property_statement(mat_res, material.base_color, "base_color", resources)) - st.sub.append(self.create_property_statement(mat_res, material.metalness, "metalness", resources)) - st.sub.append(self.create_property_statement(mat_res, material.roughness, "roughness", resources)) - st.sub.append(self.create_property_statement(mat_res, material.normal, "normal", resources, tex_only=True)) - st.sub.append(self.create_property_statement(mat_res, material.emission, "emission", resources)) + if material.type!="pbr": + raise Exception("Can't export unknown material type "+material.type) + + st = Statement(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: + first_tex = (p.texture for p in material.properties if p.texture).__next__() + if first_tex and not first_tex.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(first_tex)])) mat_res.statements.append(st) return mat_res - def create_property_statement(self, mat_res, prop, keyword, resources, *, tex_only=False): + def create_property_statement(self, mat_res, prop, resources): from .datafile import Statement if self.use_textures and prop.texture: tex_res = resources[prop.texture.image.name+".tex2d"] - fn = os.path.basename(prop.texture.image.filepath) + from .util import basename + fn = basename(prop.texture.image.filepath) if prop.texture.default_filter and fn: - return Statement(keyword+"_map", fn) + return Statement(prop.tex_keyword, fn) else: - return mat_res.create_reference_statement(keyword+"_map", tex_res) + return mat_res.create_reference_statement(prop.tex_keyword, tex_res) + elif not prop.keyword: + return elif type(prop.value)==tuple: - return Statement(keyword, *prop.value) + return Statement(prop.keyword, *prop.value) else: - return Statement(keyword, prop.value) + return Statement(prop.keyword, prop.value) class MaterialMapExporter: @@ -83,21 +107,30 @@ class MaterialMapExporter: def export_technique_resources(self, material_map, resources): from .datafile import Resource, Statement, Token base_color_name = material_map.name+"_base_color.tex2d" - if base_color_name not in resources: + base_color_res = resources.get(base_color_name) + if not base_color_res: base_color_res = Resource(base_color_name, "texture2d") - base_color_res.statements.append(Statement("min_filter", Token('NEAREST'))) - base_color_res.statements.append(Statement("mag_filter", Token('NEAREST'))) base_color_res.statements.append(Statement("storage", Token('SRGB_ALPHA'), *material_map.size)) base_color_res.statements.append(Statement("raw_data", material_map.base_color_data)) resources[base_color_name] = base_color_res + sampler_name = "nearest.samp" + sampler_res = resources.get(sampler_name) + if not sampler_res: + sampler_res = Resource(sampler_name, "sampler") + + sampler_res.statements.append(Statement("filter", Token('NEAREST'))) + + resources[sampler_name] = sampler_res + mat_name = material_map.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) resources[mat_name] = mat_res