X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_material.py;h=36dbdc690696346b544e2e367518859df60da693;hb=26b48751894c71b94ccf46bdf864d30fc29fa739;hp=826ab92688429e69cf5b735c06227674fa8fbd64;hpb=9656026f49b0063e035825fec2a96e17b6de93af;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py index 826ab926..36dbdc69 100644 --- a/blender/io_mspgl/export_material.py +++ b/blender/io_mspgl/export_material.py @@ -1,4 +1,30 @@ -import os +def create_shadow_method(tech_res, material, resources, detail): + from .datafile import Statement + + color_prop = next((p for p in material.properties if p.keyword and "color" in p.keyword), None) + + st = Statement("method", "shadow"+detail) + if material.alpha_cutoff>0.0 and color_prop and 'A' in color_prop.tex_channels: + st.sub.append(tech_res.create_reference_statement("shader", resources["occluder{}_masked.shader".format(detail)])) + ss = Statement("texture", "alpha_map") + + from .export_texture import TextureExporter + from .export_texture import SamplerExporter + texture_export = TextureExporter() + sampler_export = SamplerExporter() + + tex_res = resources[texture_export.get_texture_name(color_prop.texture, color_prop.tex_channels)] + ss.sub.append(tech_res.create_reference_statement("texture", tex_res)) + ss.sub.append(tech_res.create_reference_statement("sampler", resources[sampler_export.get_sampler_name(color_prop.texture)])) + st.sub.append(ss) + + ss = Statement("uniforms") + ss.sub.append(Statement("uniform", "alpha_cutoff", material.alpha_cutoff)) + st.sub.append(ss) + else: + st.sub.append(Statement("shader", "occluder{}.glsl.shader".format(detail))) + + return st; def create_technique_resource(material, resources): from .datafile import Resource, Statement, Token @@ -51,18 +77,13 @@ def create_technique_resource(material, resources): tech_res.statements.append(st) if material.cast_shadows: - 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) + tech_res.statements.append(create_shadow_method(tech_res, material, resources, "")); + tech_res.statements.append(create_shadow_method(tech_res, material, resources, "_thsm")); return tech_res class MaterialExporter: - def export_technique_resources(self, material, resources): + def export_technique_resources(self, ctx, material, resources): from .export_texture import SamplerExporter, TextureExporter texture_export = TextureExporter() sampler_export = SamplerExporter() @@ -71,16 +92,21 @@ class MaterialExporter: if type(material)!=Material: material = Material(material) - 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) + textured_props = [p for p in material.properties if p.texture] + + ctx.set_slices(len(textured_props)+1) + for p in textured_props: + ctx.next_slice(p.texture.image) + + tex_name = texture_export.get_texture_name(p.texture, p.tex_channels) + if tex_name not in resources: + resources[tex_name] = texture_export.export_texture(p.texture, p.tex_channels) - 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) + ctx.next_slice(material) mat_name = material.name+".mat" if mat_name not in resources: if material.type: @@ -88,6 +114,12 @@ class MaterialExporter: else: resources[mat_name] = None + if material.cast_shadows and material.alpha_cutoff>0.0: + for detail in ("", "_thsm"): + shader_name = "occluder{}_masked.shader".format(detail) + if shader_name not in resources: + resources[shader_name] = self.export_shader(shader_name, "occluder{}.glsl".format(detail), {"use_alpha_cutoff":True}, resources) + def export_technique(self, material, resources): from .material import Material if type(material)!=Material: @@ -112,14 +144,17 @@ class MaterialExporter: 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])])) + if material.alpha_cutoff>0.0: + mat_res.statements.append(Statement("alpha_cutoff", material.alpha_cutoff)) return mat_res def create_property_statement(self, mat_res, prop, resources): from .datafile import Statement if prop.texture: - tex_res = resources[prop.texture.image.name+".tex2d"] - from .util import basename + from .export_texture import TextureExporter + texture_export = TextureExporter() + tex_res = resources[texture_export.get_texture_name(prop.texture, prop.tex_channels)] return mat_res.create_reference_statement(prop.tex_keyword, tex_res) elif not prop.keyword: return @@ -128,6 +163,17 @@ class MaterialExporter: else: return Statement(prop.keyword, prop.value) + def export_shader(self, name, module, spec_values, resources): + from .datafile import Resource, Statement + shader_res = Resource(name, "shader") + + st = Statement("module", module) + for k, v in spec_values.items(): + st.sub.append(Statement("specialize", k, v)) + shader_res.statements.append(st) + + return shader_res + class MaterialAtlasExporter: def __init__(self): @@ -135,11 +181,12 @@ class MaterialAtlasExporter: def export_technique_resources(self, material_atlas, resources): from .datafile import Resource, Statement, Token - base_color_name = material_atlas.name+"_base_color.tex2d" + base_color_name = material_atlas.name+"_base_color.tex" base_color_res = resources.get(base_color_name) if not base_color_res: - base_color_res = Resource(base_color_name, "texture2d") + base_color_res = Resource(base_color_name, "texture") + base_color_res.statements.append(Statement("type", Token("\\2d"))) 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))