X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmaterial.py;h=ccbf0083f143988af633523c2b4ec2b30e10d55c;hb=4291fcf9489087492085b70e7960bdb3dbb5dc9c;hp=dc6d934bedfdcc5c5e968cbbdf2fd878844d7709;hpb=893c0645802c46eb60b04a87e79a5a4d69e32ea2;p=libs%2Fgl.git diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py index dc6d934b..ccbf0083 100644 --- a/blender/io_mspgl/material.py +++ b/blender/io_mspgl/material.py @@ -219,10 +219,13 @@ class Material: self.technique = material.technique self.render_methods = material.render_methods[:] self.uniforms = material.uniforms[:] + self.face_cull = 'BACK' if material.use_backface_culling else 'NONE' self.receive_shadows = material.receive_shadows self.cast_shadows = (material.shadow_method!='NONE') self.blend_type = 'ALPHA' if material.blend_method=='BLEND' else 'NONE' + self.alpha_cutoff = material.alpha_threshold if material.blend_method=='CLIP' else 0.0 self.image_based_lighting = material.image_based_lighting + self.instancing = material.instancing if self.render_mode=='EXTERNAL' and not self.technique: raise Exception("Invalid configuration on material {}: No technique for external rendering".format(self.name)) @@ -235,18 +238,18 @@ class Material: 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: + from_node, from_sock = get_linked_node_and_socket(material.node_tree, out_node.inputs["Surface"]) + if not from_node: if self.render_mode=='BUILTIN': raise Exception("Invalid configuration on material {}: Empty material with builtin rendering".format(self.name)) return - additive_node, _ = check_additive_blend(material.node_tree, surface_node) - if additive_node: + surface_node = PropertyNode(material.node_tree, from_node, from_sock) + if surface_node.type=='ADDITIVE': self.blend_type = 'ADDITIVE' - surface_node = additive_node + from_node = surface_node.input.node - if surface_node.type=='BSDF_PRINCIPLED': + if from_node.type=='BSDF_PRINCIPLED': self.type = "pbr" base_color = self.create_property("base_color", (0.8, 0.8, 0.8, 1.0)) @@ -255,13 +258,13 @@ class Material: 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"]) - 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"]) - elif surface_node.type=='EMISSION' or surface_node.type=='MIX_SHADER': - color_input, alpha_input = get_unlit_inputs(material.node_tree, surface_node, self.blend_type=='ADDITIVE') + base_color.set_from_input(material.node_tree, from_node.inputs["Base Color"], from_node.inputs["Alpha"]) + metalness.set_from_input(material.node_tree, from_node.inputs["Metallic"]) + roughness.set_from_input(material.node_tree, from_node.inputs["Roughness"]) + normal.set_from_input(material.node_tree, from_node.inputs["Normal"]) + emission.set_from_input(material.node_tree, from_node.inputs["Emission"]) + elif from_node.type=='EMISSION' or from_node.type=='MIX_SHADER': + color_input, alpha_input = get_unlit_inputs(material.node_tree, from_node, self.blend_type=='ADDITIVE') if not color_input: raise Exception("Unsupported configuration for unlit material {}".format(self.name)) @@ -273,7 +276,7 @@ class Material: if self.blend_type=='ADDITIVE' and alpha_input: self.blend_type = 'ADDITIVE_ALPHA' else: - raise Exception("Unsupported surface node type {} on material {}".format(surface_node.type, self.name)) + raise Exception("Unsupported surface node type {} on material {}".format(from_node.type, self.name)) sampler_settings = None for p in self.properties: @@ -294,70 +297,3 @@ class Material: prop = MaterialProperty(*args) self.properties.append(prop) return prop - - -class MaterialAtlas: - def __init__(self, materials): - self.render_mode = materials[0].render_mode - if self.render_mode=='EXTERNAL': - raise Exception("Material atlas with external render mode does not make sense") - - 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 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") - - count = len(self.materials) - size = 1 - while size*size*2=count: - self.size = (size, size) - else: - self.size = (size*2, size) - - from .util import get_colormap - - cm = get_colormap(True) - self.base_color_data = "" - for m in map(Material, self.materials): - if any(p.texture for p in m.properties): - raise Exception("Texturing is incompatible with material atlas") - base_color = [int(cm(c)*255) for c in m.base_color.value] - self.base_color_data += "\\x{:02X}\\x{:02X}\\x{:02X}\\xFF".format(*base_color) - self.base_color_data += "\\x00\\x00\\x00\\x00"*(self.size[0]*self.size[1]-count) - - def get_material_uv(self, material): - index = self.material_names.index(material.name) - x = index%self.size[0] - y = index//self.size[0] - return ((x+0.5)/self.size[0], (y+0.5)/self.size[1]) - -def create_material_atlas(context, material): - if not material.material_atlas: - raise Exception("Material is not part of a material atlas") - - method_hash = compute_render_method_hash(material) - materials = [] - for m in context.blend_data.materials: - if m.material_atlas and compute_render_method_hash(m)==method_hash: - materials.append(m) - - return MaterialAtlas(materials)