X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=73f33d5c29a669eccdb235e0823dea95a1086209;hb=2680cc0bf251db566753dbe9bf947ba6a4b083d2;hp=aba58e5518d4ebf9477da591ccb2a0e776cad249;hpb=4791fe8e6451aa6ce62e530fe12904f5cfc112eb;p=libs%2Fgl.git diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py index aba58e55..73f33d5c 100644 --- a/blender/io_mspgl/material.py +++ b/blender/io_mspgl/material.py @@ -1,5 +1,13 @@ import os +def compute_render_method_hash(material): + descr = "" + for m in material.render_methods: + if descr: + descr += "," + descr += "{}={}".format(m.tag, m.shader) + return hash(descr) + def check_group(node_tree, group, func): from .util import get_linked_node_and_socket @@ -31,6 +39,25 @@ def check_invert_green(node_tree, node): return get_linked_node_and_socket(node_tree, red.inputs["Image"]) +def get_unlit_inputs(node_tree, node): + if node.type=='GROUP': + return check_group(node_tree, node, get_unlit_inputs) + elif node.type=='MIX_SHADER': + from .util import get_linked_node_and_socket + + shader1, _ = get_linked_node_and_socket(node_tree, node.inputs[1]) + shader2, _ = get_linked_node_and_socket(node_tree, node.inputs[2]) + if shader1.type=='BSDF_TRANSPARENT' and shader2.type=='EMISSION': + factor_input = node.inputs["Fac"] + factor_from, _ = get_linked_node_and_socket(node_tree, factor_input) + color_input = shader2.inputs["Color"] + color_from, _ = get_linked_node_and_socket(node_tree, color_input) + if factor_from==color_from: + return (color_input, factor_input) + elif node.type=='EMISSION': + return (node.inputs["Color"], None) + return (None, None) + class MaterialProperty: def __init__(self, keyword, tex_keyword, value): self.keyword = keyword @@ -93,14 +120,16 @@ class Material: self.render_mode = material.render_mode self.technique = material.technique - self.shader = material.shader + self.render_methods = material.render_methods[:] + self.uniforms = material.uniforms[:] self.receive_shadows = material.receive_shadows self.cast_shadows = (material.shadow_method!='NONE') + self.image_based_lighting = material.image_based_lighting if self.render_mode=='EXTERNAL' and not self.technique: raise Exception("Invalid configuration on material {}: No technique for external rendering".format(self.name)) - elif self.render_mode=='CUSTOM' and not self.shader: - raise Exception("Invalid configuration on material {}: No shader for custom rendering".format(self.name)) + elif self.render_mode=='CUSTOM' and not self.render_methods: + raise Exception("Invalid configuration on material {}: No render methods for custom rendering".format(self.name)) out_node = next((n for n in material.node_tree.nodes if n.type=='OUTPUT_MATERIAL'), None) if not out_node: @@ -127,19 +156,23 @@ class Material: roughness.set_from_input(material.node_tree, surface_node.inputs["Roughness"]) normal.set_from_input(material.node_tree, surface_node.inputs["Normal"]) emission.set_from_input(material.node_tree, surface_node.inputs["Emission"]) - elif surface_node.type=='EMISSION': + elif surface_node.type=='EMISSION' or surface_node.type=='MIX_SHADER': + color_input, alpha_input = get_unlit_inputs(material.node_tree, surface_node) + if not color_input: + raise Exception("Unsupported configuration for unlit material {}".format(self.name)) + self.type = "unlit" color = self.create_property("color", "texture", (1.0, 1.0, 1.0, 1.0)) - color.set_from_input(material.node_tree, surface_node.inputs["Color"]) + color.set_from_input(material.node_tree, color_input, alpha_input) else: raise Exception("Unsupported surface node type {} on material {}".format(surface_node.type, self.name)) sampler_settings = None for p in self.properties: if p.texture: - settings = (p.texture.default_filter, p.texture.interpolation, p.texture.use_mipmap, p.texture.max_anisotropy) + settings = (p.texture.interpolation, p.texture.use_mipmap, p.texture.max_anisotropy) if sampler_settings is None: sampler_settings = settings elif settings!=sampler_settings: @@ -163,19 +196,24 @@ class MaterialAtlas: if self.render_mode=='EXTERNAL': raise Exception("Material atlas with external render mode does not make sense") - self.shader = materials[0].shader - if self.shader: - self.name = "material_atlas_"+os.path.splitext(self.shader)[0] + if self.render_mode=='CUSTOM': + self.render_methods = materials[0].render_methods + else: + self.render_methods = None + if self.render_methods: + self.name = "material_atlas_"+os.path.splitext(self.render_methods[0].shader)[0] else: self.name = "material_atlas" self.receive_shadows = materials[0].receive_shadows self.cast_shadows = (materials[0].shadow_method!='NONE') self.materials = materials self.material_names = [m.name for m in self.materials] + self.uniforms = None + method_hash = compute_render_method_hash(self) for m in self.materials: if m.render_mode!=self.render_mode: raise Exception("Conflicting render modes in MaterialAtlas constructor") - if self.render_mode=='CUSTOM' and m.shader!=self.shader: + if self.render_mode=='CUSTOM' and compute_render_method_hash(m)!=method_hash: raise Exception("Conflicting shaders in MaterialAtlas constructor") if m.receive_shadows!=self.receive_shadows or m.shadow_method!=materials[0].shadow_method: raise Exception("Conflicting shadow settings in MaterialAtlas constructor") @@ -210,10 +248,10 @@ def create_material_atlas(context, material): if not material.material_atlas: raise Exception("Material is not part of a material atlas") - shader = material.shader + method_hash = compute_render_method_hash(material) materials = [] for m in context.blend_data.materials: - if m.material_atlas and m.shader==shader: + if m.material_atlas and compute_render_method_hash(m)==method_hash: materials.append(m) return MaterialAtlas(materials)