X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=7299e636ea7a6e2682dd52dd4051e64df72b505b;hb=6b9338845dfee441cd18ad6c633e4feef8ad14e1;hp=5e06fd8aa061ef83ca9540b1d97163657d0011be;hpb=3c0525a665f9a4d87b2937bcb9282f51cc0017a1;p=libs%2Fgl.git diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py index 5e06fd8a..7299e636 100644 --- a/blender/io_mspgl/material.py +++ b/blender/io_mspgl/material.py @@ -1,13 +1,36 @@ import os -def get_linked_node_and_socket(node_tree, socket): - for l in node_tree.links: - if socket==l.to_socket: - return (l.from_node, l.from_socket) - elif socket==l.from_socket: - return (l.to_node, l.to_socket) +def check_group(node_tree, group, func): + from .util import get_linked_node_and_socket + + output = group.node_tree.nodes["Group Output"] + from_node, _ = get_linked_node_and_socket(group.node_tree, output.inputs[0]) + if from_node: + from_node, _ = func(group.node_tree, from_node) + if from_node and from_node.type=='GROUP_INPUT': + return get_linked_node_and_socket(node_tree, group.inputs[0]) return (None, None) +def check_invert_green(node_tree, node): + if node.type=='GROUP': + return check_group(node_tree, node, check_invert_green) + elif node.type!='COMBRGB': + return (None, None) + + from .util import get_linked_node_and_socket + + green, g_sock = get_linked_node_and_socket(node_tree, node.inputs["G"]) + if not green or green.type!='MATH' or green.operation!='SUBTRACT': + return (None, None) + green, g_sock = get_linked_node_and_socket(node_tree, green.inputs[1]) + + red, r_sock = get_linked_node_and_socket(node_tree, node.inputs["R"]) + blue, b_sock = get_linked_node_and_socket(node_tree, node.inputs["B"]) + if not red or red.type!='SEPRGB' or blue!=red or green!=red: + return (None, None) + + return get_linked_node_and_socket(node_tree, red.inputs["Image"]) + class MaterialProperty: def __init__(self, keyword, tex_keyword, value): self.keyword = keyword @@ -15,6 +38,7 @@ class MaterialProperty: self.value = value self.texture = None self.tex_usage = None + self.invert_green = False def set_from_input(self, node_tree, input_socket, alpha_socket=None): if self.keyword: @@ -27,11 +51,19 @@ class MaterialProperty: self.value = input_socket.default_value if self.tex_keyword: + from .util import get_linked_node_and_socket + from_node, _ = get_linked_node_and_socket(node_tree, input_socket) alpha_from = None if from_node: + usage = None if from_node.type=='NORMAL_MAP': from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"]) + invert, _ = check_invert_green(node_tree, from_node) + if invert: + from_node = invert + self.invert_green = True + usage = 'RGB' elif from_node.type=='RGBTOBW': from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"]) @@ -42,7 +74,9 @@ class MaterialProperty: if from_node.type=='TEX_IMAGE': self.texture = from_node - if alpha_from: + if usage: + self.tex_usage = usage + elif alpha_from: self.tex_usage = 'RGBA' elif type(self.value)==tuple: self.tex_usage = 'RGB' @@ -60,25 +94,25 @@ class Material: self.render_mode = material.render_mode self.technique = material.technique self.shader = material.shader + 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("Missing technique with external rendering mode") + 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("Missing shader with custom rendering mode") - - out_node = None - for n in material.node_tree.nodes: - if n.type=='OUTPUT_MATERIAL': - out_node = n - break + raise Exception("Invalid configuration on material {}: No shader 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: - raise Exception("No material output node found") + raise Exception("No output node found on material {}".format(self.name)) + + from .util import get_linked_node_and_socket surface_node, _ = get_linked_node_and_socket(material.node_tree, out_node.inputs["Surface"]) if not surface_node: if self.render_mode=='BUILTIN': - raise Exception("Empty material can't use builtin rendering mode") + raise Exception("Invalid configuration on material {}: Empty material with builtin rendering".format(self.name)) return elif surface_node.type=='BSDF_PRINCIPLED': self.type = "pbr" @@ -86,7 +120,7 @@ class Material: base_color = self.create_property("base_color", (0.8, 0.8, 0.8, 1.0)) metalness = self.create_property("metalness", 0.0) roughness = self.create_property("roughness", 0.5) - normal = self.create_property("normal") + normal = self.create_property("normal_map") emission = self.create_property("emission", (0.0, 0.0, 0.0)) base_color.set_from_input(material.node_tree, surface_node.inputs["Base Color"], surface_node.inputs["Alpha"]) @@ -101,7 +135,7 @@ class Material: color.set_from_input(material.node_tree, surface_node.inputs["Color"]) else: - raise Exception("Unsupported surface node type "+surface_node.type) + raise Exception("Unsupported surface node type {} on material {}".format(surface_node.type, self.name)) sampler_settings = None for p in self.properties: @@ -110,7 +144,7 @@ class Material: if sampler_settings is None: sampler_settings = settings elif settings!=sampler_settings: - raise Exception("Conflicting sampler settings in material textures") + raise Exception("Material {} has conflicting texture sampler settings".format(self.name)) def create_property(self, *args): prop = None @@ -135,6 +169,8 @@ class MaterialAtlas: self.name = "material_atlas_"+os.path.splitext(self.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] for m in self.materials: @@ -142,6 +178,8 @@ class MaterialAtlas: raise Exception("Conflicting render modes in MaterialAtlas constructor") if self.render_mode=='CUSTOM' and m.shader!=self.shader: 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") count = len(self.materials) size = 1 @@ -179,6 +217,4 @@ def create_material_atlas(context, material): if m.material_atlas and m.shader==shader: materials.append(m) - mat_map = MaterialAtlas(materials) - - return mat_map + return MaterialAtlas(materials)