X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=d25286055056034a68d936976d18b4755ceb0685;hb=401f74574e55fd9e490eaa4f16f1cc97d0603513;hp=b275caa37f54a92a2a459df8ca9d66d7d12d90d0;hpb=180b20bee11425a776c5ead05afcf6a63945d3b2;p=libs%2Fgl.git diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py index b275caa3..d2528605 100644 --- a/blender/io_mspgl/material.py +++ b/blender/io_mspgl/material.py @@ -9,51 +9,51 @@ def get_linked_node_and_socket(node_tree, socket): return (None, None) class MaterialProperty: - def __init__(self, value): + def __init__(self, keyword, tex_keyword, value): + self.keyword = keyword + self.tex_keyword = tex_keyword self.value = value self.texture = None self.tex_usage = None def set_from_input(self, node_tree, input_socket, alpha_socket=None): - if type(self.value)==tuple: - if alpha_socket: - self.value = input_socket.default_value[:len(self.value)-1]+(alpha_socket.default_value,) - else: - self.value = input_socket.default_value[:len(self.value)] - else: - self.value = input_socket.default_value - - from_node, _ = get_linked_node_and_socket(node_tree, input_socket) - alpha_from = None - if from_node: - if from_node.type=='NORMAL_MAP': - from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"]) - - if alpha_socket: - alpha_from, _ = get_linked_node_and_socket(node_tree, alpha_socket) - if alpha_from and alpha_from!=from_node: - raise Exception("Separate textures for color and alpha are not supported") - - if from_node.type=='TEX_IMAGE': - self.texture = from_node - if alpha_from: - self.tex_usage = 'RGBA' - elif type(self.value)==tuple: - self.tex_usage = 'RGB' + if self.keyword: + if type(self.value)==tuple: + if alpha_socket: + self.value = input_socket.default_value[:len(self.value)-1]+(alpha_socket.default_value,) else: - self.tex_usage = 'GRAY' + self.value = input_socket.default_value[:len(self.value)] else: - raise Exception("Unsupported property input node type "+from_node.type) + self.value = input_socket.default_value + + if self.tex_keyword: + from_node, _ = get_linked_node_and_socket(node_tree, input_socket) + alpha_from = None + if from_node: + if from_node.type=='NORMAL_MAP': + from_node, _ = get_linked_node_and_socket(node_tree, from_node.inputs["Color"]) + + if alpha_socket: + alpha_from, _ = get_linked_node_and_socket(node_tree, alpha_socket) + if alpha_from and alpha_from!=from_node: + raise Exception("Separate textures for color and alpha are not supported") + + if from_node.type=='TEX_IMAGE': + self.texture = from_node + if alpha_from: + self.tex_usage = 'RGBA' + elif type(self.value)==tuple: + self.tex_usage = 'RGB' + else: + self.tex_usage = 'GRAY' + else: + raise Exception("Unsupported property input node type "+from_node.type) class Material: def __init__(self, material): self.name = material.name - - self.base_color = MaterialProperty((0.8, 0.8, 0.8, 1.0)) - self.metalness = MaterialProperty(0.0) - self.roughness = MaterialProperty(0.5) - self.normal = MaterialProperty((0.0, 0.0, 0.1)) - self.emission = MaterialProperty((0.0, 0.0, 0.0)) + self.type = None + self.properties = [] self.render_mode = material.render_mode self.technique = material.technique @@ -75,17 +75,45 @@ class Material: surface_node, _ = get_linked_node_and_socket(material.node_tree, out_node.inputs["Surface"]) if not surface_node: - raise Exception("Material has no surface node") - elif surface_node.type!='BSDF_PRINCIPLED': + if self.render_mode=='BUILTIN': + raise Exception("Empty material can't use builtin rendering mode") + return + elif surface_node.type=='BSDF_PRINCIPLED': + self.type = "pbr" + + 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") + 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"]) + metalness.set_from_input(material.node_tree, surface_node.inputs["Metallic"]) + 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"]) + else: raise Exception("Unsupported surface node type "+surface_node.type) - self.base_color.set_from_input(material.node_tree, surface_node.inputs["Base Color"], surface_node.inputs["Alpha"]) - self.metalness.set_from_input(material.node_tree, surface_node.inputs["Metallic"]) - self.roughness.set_from_input(material.node_tree, surface_node.inputs["Roughness"]) - self.normal.set_from_input(material.node_tree, surface_node.inputs["Normal"]) - self.emission.set_from_input(material.node_tree, surface_node.inputs["Emission"]) - - self.properties = (self.base_color, self.metalness, self.roughness, self.normal, self.emission) + 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) + if sampler_settings is None: + sampler_settings = settings + elif settings!=sampler_settings: + raise Exception("Conflicting sampler settings in material textures") + + def create_property(self, *args): + prop = None + if len(args)==1: + prop = MaterialProperty(None, args[0], None) + elif len(args)==2: + prop = MaterialProperty(args[0], args[0]+"_map", args[1]) + else: + prop = MaterialProperty(*args) + self.properties.append(prop) + return prop class MaterialMap: @@ -137,10 +165,10 @@ def create_material_map(context, material): if not material.material_map: raise Exception("Material is not part of a material map") - tech = material.technique + shader = material.shader materials = [] for m in context.blend_data.materials: - if m.material_map and m.technique==tech: + if m.material_map and m.shader==shader: materials.append(m) mat_map = MaterialMap(materials)