Refactor material property handling in the Blender exporter

[libs/gl.git] / blender / io_mspgl / material.py

diff --git a/blender/io_mspgl/material.py b/blender/io_mspgl/material.py
index ce31317418042f1d92d2d69e7f12432d47740cf2..e8a9089adb3ffed538856da4fc3772403a7b018e 100644 (file)
--- a/blender/io_mspgl/material.py
+++ b/blender/io_mspgl/material.py
@@ -20,7 +20,7 @@ class MaterialProperty:
                                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:
+               elif self.value is not None:
                        self.value = input_socket.default_value
 
                from_node, _ = get_linked_node_and_socket(node_tree, input_socket)
@@ -48,12 +48,7 @@ class MaterialProperty:
 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.properties = {}
 
                self.render_mode = material.render_mode
                self.technique = material.technique
@@ -79,16 +74,20 @@ class Material:
                elif surface_node.type!='BSDF_PRINCIPLED':
                        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"])
+               base_color = self.properties["base_color"] = MaterialProperty((0.8, 0.8, 0.8, 1.0))
+               metalness = self.properties["metalness"] = MaterialProperty(0.0)
+               roughness = self.properties["roughness"] = MaterialProperty(0.5)
+               normal = self.properties["normal"] = MaterialProperty(None)
+               emission = self.properties["emission"] = MaterialProperty((0.0, 0.0, 0.0))
 
-               self.properties = (self.base_color, self.metalness, self.roughness, self.normal, self.emission)
+               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"])
 
                sampler_settings = None
-               for p in self.properties:
+               for p in self.properties.values():
                        if p.texture:
                                settings = (p.texture.default_filter, p.texture.interpolation, p.texture.use_mipmap, p.texture.max_anisotropy)
                                if sampler_settings is None:
@@ -146,10 +145,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)