X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=6abd78c2d05b8157a429405c02e8ad208a772448;hb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;hp=f51a4a49a88e47c7fbf96055c381be576c7fbb5c;hpb=180b20bee11425a776c5ead05afcf6a63945d3b2;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py index f51a4a49..6abd78c2 100644 --- a/blender/io_mspgl/export_material.py +++ b/blender/io_mspgl/export_material.py @@ -1,19 +1,26 @@ import os -def create_technique_resource(material, resources, single_file): +def create_technique_resource(material, resources): from .datafile import Resource, Statement - tech_res = Resource(material.name+".tech") + tech_res = Resource(material.name+".tech", "technique") mat_res = resources[material.name+".mat"] st = Statement("pass", "") - if single_file: + if mat_res: st.sub.append(tech_res.create_embed_statement("material", mat_res)) - else: - st.sub.append(tech_res.create_reference_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)) + + 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) @@ -21,91 +28,114 @@ def create_technique_resource(material, resources, single_file): class MaterialExporter: def __init__(self): - self.single_file = True - 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.single_file + texture_export.inline_data = self.inline_texture_data 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) - 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) mat_name = material.name+".mat" if mat_name not in resources: - resources[mat_name] = self.export_material(material, resources=resources) - - def export_technique(self, material, *, resources): - return create_technique_resource(material, resources, self.single_file) + if material.type: + resources[mat_name] = self.export_material(material, resources) + else: + resources[mat_name] = None - def export_material(self, material, *, resources): - from .datafile import Resource, Statement - mat_res = Resource(material.name+".mat") + def export_technique(self, material, resources): + return create_technique_resource(material, resources) - 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)) - mat_res.statements.append(st) + 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) + + 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) + 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, 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: + if prop.texture: tex_res = resources[prop.texture.image.name+".tex2d"] - fn = os.path.basename(prop.texture.image.filepath) - if self.single_file: - raise Exception("Can't export textures to a single file") - elif prop.texture.default_filter and fn: - return Statement(keyword+"_map", fn) + 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(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: +class MaterialAtlasExporter: def __init__(self): - self.single_file = True + pass - def export_technique_resources(self, material_map, resources): + def export_technique_resources(self, material_atlas, 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 = Resource(base_color_name) + base_color_name = material_atlas.name+"_base_color.tex2d" + 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)) + 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)) resources[base_color_name] = base_color_res - mat_name = material_map.name+".mat" + 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_atlas.name+".mat" if mat_name not in resources: - mat_res = Resource(mat_name) - st = Statement("pbr") - st.sub.append(mat_res.create_reference_statement("base_color_map", base_color_res)) - mat_res.statements.append(st) + mat_res = Resource(mat_name, "material") + 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_map, *, resources): - return create_technique_resource(material_map, resources, self.single_file) + def export_technique(self, material_atlas, resources): + return create_technique_resource(material_atlas, resources)