]> git.tdb.fi Git - libs/gl.git/blobdiff - blender/io_mspgl/material.py
Add a tint property for PBR materials
[libs/gl.git] / blender / io_mspgl / material.py
index 633f030f2ede62bc82c487ec8eb454e2e85b98b4..3e2bce001943d4c26090129dcd9650153abae9a1 100644 (file)
@@ -19,6 +19,7 @@ class PropertyNode:
 
                checks = [self.check_group,
                        self.check_scale,
+                       self.check_tint,
                        self.check_gray,
                        self.check_extract,
                        self.check_normal,
@@ -63,6 +64,17 @@ class PropertyNode:
                                        self.data = self.node.inputs[i].default_value
                                        return self.set_input_from_linked(self.node.inputs[1-i])
 
+       def check_tint(self):
+               if self.node.type!='MIX_RGB':
+                       return
+
+               if self.node.blend_type=='MULTIPLY':
+                       for i in range(2):
+                               if not self.node.inputs[1+i].is_linked:
+                                       self.type = 'TINT'
+                                       self.data = self.node.inputs[1+i].default_value[:]
+                                       return self.set_input_from_linked(self.node.inputs[2-i])
+
        def check_gray(self):
                if self.node.type=='RGBTOBW':
                        self.type = 'GRAY'
@@ -152,6 +164,7 @@ class MaterialProperty:
                self.texture = None
                self.tex_channels = None
                self.scale = 1.0
+               self.tint = None
 
        def set_from_input(self, node_tree, input_socket, alpha_socket=None):
                if self.keyword:
@@ -183,6 +196,8 @@ class MaterialProperty:
                                                channels = ['~'+c if c in n.data else c for c in channels]
                                        elif n.type=='SCALE':
                                                self.scale = n.data
+                                       elif n.type=='TINT':
+                                               self.tint = n.data
                                        elif n.type=='TEXTURE':
                                                self.texture = n.node
                                        n = n.input
@@ -219,10 +234,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))
@@ -250,12 +268,15 @@ class Material:
                        self.type = "pbr"
 
                        base_color = self.create_property("base_color", (0.8, 0.8, 0.8, 1.0))
+                       tint = self.create_property("tint", (1.0, 1.0, 1.0, 1.0))
                        metalness = self.create_property("metalness", 0.0)
                        roughness = self.create_property("roughness", 0.5)
                        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, from_node.inputs["Base Color"], from_node.inputs["Alpha"])
+                       if base_color.tint:
+                               tint.value = base_color.tint
                        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"])
@@ -294,70 +315,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:
-                       size *= 2
-               if size*size>=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)