[WIP] major material rework

io_mesh_w3d/__init__.py

@@ -1,10 +1,14 @@
 # <pep8 compliant>
 # Written by Stephan Vedder and Michael Schnabel
 
+import os
+import bpy
+from bpy.types import Panel
 from bpy_extras.io_utils import ImportHelper, ExportHelper
 from io_mesh_w3d.export_utils import save
 from io_mesh_w3d.custom_properties import *
 
+
 bl_info = {
     'name': 'Import/Export Westwood W3D Format (.w3d/.w3x)',
     'author': 'OpenSage Developers',
@@ -223,21 +227,22 @@ def menu_func_import(self, _context):
     self.layout.operator(ImportW3D.bl_idname, text='Westwood W3D (.w3d/.w3x)')
 
 
-class OBJECT_PROPERTIES_PANEL_PT_w3d(Panel):
+class MESH_PROPERTIES_PANEL_PT_w3d(Panel):
     bl_label = 'W3D Properties'
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
-    bl_context = 'object'
+    bl_context = 'data'
 
     def draw(self, context):
         layout = self.layout
         col = layout.column()
-        col.prop(context.active_object, 'object_type')
-        if context.active_object.object_type == 'DAZZLE':
+        mesh = context.active_object.data
+        col.prop(mesh, 'object_type')
+        if mesh.object_type == 'DAZZLE':
             col = layout.column()
-            col.prop(context.active_object, 'dazzle_type')
+            col.prop(mesh, 'dazzle_type')
         col = layout.column()
-        col.prop(context.active_object, 'userText')
+        col.prop(mesh, 'userText')
 
 
 class BONE_PROPERTIES_PANEL_PT_w3d(Panel):
@@ -253,166 +258,88 @@ def draw(self, context):
             col.prop(context.active_bone, 'visibility')
 
 
-class MATERIAL_PROPERTIES_PANEL_PT_w3d(Panel):
-    bl_label = 'W3D Properties'
-    bl_space_type = 'PROPERTIES'
-    bl_region_type = 'WINDOW'
-    bl_context = 'material'
+from io_mesh_w3d.common.shading.node_socket_texture import NodeSocketTexture, NodeSocketInterfaceTexture
+from io_mesh_w3d.common.shading.node_socket_texture_alpha import NodeSocketTextureAlpha
+from io_mesh_w3d.common.shading.node_socket_vec2 import NodeSocketVector2
+from io_mesh_w3d.common.shading.node_socket_vec4 import NodeSocketVector4
+from io_mesh_w3d.common.shading.node_socket_enum import *
 
-    def draw(self, context):
-        layout = self.layout
-        mat = context.object.active_material
-        col = layout.column()
-        col.prop(mat, 'material_type')
 
-        if mat.material_type == 'PRELIT_MATERIAL':
-            col = layout.column()
-            col.prop(mat, 'prelit_type')
+CLASSES = (
+    NodeSocketTexture,
+    NodeSocketInterfaceTexture,
+    NodeSocketEnum,
+    NodeSocketEnumMaterialAttributes,
+    NodeSocketEnumDepthCompare,
+    NodeSocketEnumDepthMaskWrite,
+    NodeSocketEnumAlphatest,
+    NodeSocketEnumDestBlendFunc,
+    NodeSocketEnumPriGradient,
+    NodeSocketEnumSecGradient,
+    NodeSocketEnumSrcBlendFunc,
+    NodeSocketEnumTexturing,
+    NodeSocketEnumDetailColorFunc,
+    NodeSocketEnumDetailAlphaFunc,
+    NodeSocketTextureAlpha,
+    NodeSocketVector2,
+    NodeSocketVector4,
+    ExportW3D,
+    ImportW3D,
+    MESH_PROPERTIES_PANEL_PT_w3d,
+    BONE_PROPERTIES_PANEL_PT_w3d)
 
-        col = layout.column()
-        col.prop(mat, 'surface_type')
-        col = layout.column()
-        col.prop(mat, 'blend_mode')
-        col = layout.column()
-        col.prop(mat, 'ambient')
-        col = layout.column()
-        col.prop(mat, 'opacity')
 
-        if mat.material_type == 'VERTEX_MATERIAL' or mat.material_type == 'PRELIT_MATERIAL':
-            col = layout.column()
-            col.prop(mat, 'attributes')
-            col = layout.column()
-            col.prop(mat, 'translucency')
-            col = layout.column()
-            col.prop(mat, 'vm_args_0')
-            col = layout.column()
-            col.prop(mat, 'vm_args_1')
+from io_mesh_w3d.common.utils.node_group_creator import NodeGroupCreator
+from io_mesh_w3d.common.shading.vertex_material_group import VertexMaterialGroup
 
-            col = layout.column()
-            layout.label(text="Shader Properties")
-            col = layout.column()
-            col.prop(mat.shader, 'depth_compare')
-            col = layout.column()
-            col.prop(mat.shader, 'depth_mask')
-            col = layout.column()
-            col.prop(mat.shader, 'color_mask')
-            col = layout.column()
-            col.prop(mat.shader, 'dest_blend')
-            col = layout.column()
-            col.prop(mat.shader, 'fog_func')
-            col = layout.column()
-            col.prop(mat.shader, 'pri_gradient')
-            col = layout.column()
-            col.prop(mat.shader, 'sec_gradient')
-            col = layout.column()
-            col.prop(mat.shader, 'src_blend')
-            col = layout.column()
-            col.prop(mat.shader, 'texturing')
-            col = layout.column()
-            col.prop(mat.shader, 'detail_color_func')
-            col = layout.column()
-            col.prop(mat.shader, 'detail_alpha_func')
-            col = layout.column()
-            col.prop(mat.shader, 'shader_preset')
-            col = layout.column()
-            col.prop(mat.shader, 'alpha_test')
-            col = layout.column()
-            col.prop(mat.shader,
-                     'post_detail_color_func')
-            col = layout.column()
-            col.prop(mat.shader,
-                     'post_detail_alpha_func')
-
-        else:
-            col = layout.column()
-            col.prop(mat, 'technique')
-            col.prop(mat, 'alpha_test')
-            col = layout.column()
-            col.prop(mat, 'bump_uv_scale')
-            col = layout.column()
-            col.prop(mat, 'edge_fade_out')
-            col = layout.column()
-            col.prop(mat, 'depth_write')
-            col = layout.column()
-            col.prop(mat, 'sampler_clamp_uv_no_mip_0')
-            col = layout.column()
-            col.prop(mat, 'sampler_clamp_uv_no_mip_1')
-            col = layout.column()
-            col.prop(mat, 'num_textures')
-            col = layout.column()
-            col.prop(mat, 'texture_1')
-            col = layout.column()
-            col.prop(mat, 'secondary_texture_blend_mode')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_mapper_0')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_mapper_1')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_0')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_1')
-            col = layout.column()
-            col.prop(mat, 'environment_texture')
-            col = layout.column()
-            col.prop(mat, 'environment_mult')
-            col = layout.column()
-            col.prop(mat, 'recolor_texture')
-            col = layout.column()
-            col.prop(mat, 'recolor_mult')
-            col = layout.column()
-            col.prop(mat, 'use_recolor')
-            col = layout.column()
-            col.prop(mat, 'house_color_pulse')
-            col = layout.column()
-            col.prop(mat, 'scrolling_mask_texture')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_angle')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_u_0')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_v_0')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_u_1')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_v_1')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_u_2')
-            col = layout.column()
-            col.prop(mat, 'tex_coord_transform_v_2')
-            col = layout.column()
-            col.prop(mat, 'tex_ani_fps_NPR_lastFrame_frameOffset_0')
-            col = layout.column()
-            col.prop(mat, 'ion_hull_texture')
-            col = layout.column()
-            col.prop(mat, 'multi_texture_enable')
+def register_node_groups():
+    dirname = os.path.dirname(__file__)
+    directory = os.path.join(dirname, 'node_group_templates')
 
+    for file in os.listdir(directory):
+        if not file.endswith(".xml"):
+            continue
+        NodeGroupCreator().create(directory, file)
 
-CLASSES = (
-    ExportW3D,
-    ImportW3D,
-    ShaderProperties,
-    OBJECT_PROPERTIES_PANEL_PT_w3d,
-    BONE_PROPERTIES_PANEL_PT_w3d,
-    MATERIAL_PROPERTIES_PANEL_PT_w3d
-)
+    VertexMaterialGroup.register(VertexMaterialGroup.name)
 
 
 def register():
     for class_ in CLASSES:
         bpy.utils.register_class(class_)
 
-    Material.shader = PointerProperty(type=ShaderProperties)
-
     bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
     bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
 
+    # workaround to register the node group when the addon is active
+    # since bpy.data is not yet accessible
+    import time
+    from threading import Timer
+
+    Timer(1, register_node_groups, ()).start()
+
+
+def unregister_node_groups():
+    dirname = os.path.dirname(__file__)
+    directory = os.path.join(dirname, 'node_group_templates')
+
+    for file in os.listdir(directory):
+        if not file.endswith(".xml"):
+            continue
+        NodeGroupCreator().unregister(directory, file)
+
+    VertexMaterialGroup.unregister(VertexMaterialGroup.name)
+
 
 def unregister():
     for class_ in reversed(CLASSES):
         bpy.utils.unregister_class(class_)
+
     bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
     bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
 
+    unregister_node_groups()
+
 
 if __name__ == '__main__':
     register()

io_mesh_w3d/common/io_xml.py

@@ -0,0 +1,112 @@
+# <pep8 compliant>
+# Written by Stephan Vedder and Michael Schnabel
+
+import io
+import xml.etree.ElementTree as ET
+from mathutils import Vector
+
+
+def create_node(self, identifier):
+    return ET.SubElement(self, identifier)
+
+def pretty_print(elem, level=0):
+    i = '\n' + level * '  '
+    if elem:
+        elem.text = i + '  '
+        elem.tail = i
+        for elem in elem:
+            pretty_print(elem, level + 1)
+        elem.tail = i
+    else:
+        if level and (not elem.tail or not elem.tail.strip()):
+            elem.tail = i
+
+
+def write(root, path):
+    pretty_print(root)
+    xml_spec = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+    data = bytes(xml_spec, 'utf-8') + ET.tostring(root)
+
+    file = open(path, 'wb')
+    file.write(data)
+    file.close()
+
+
+def strip_namespaces(it):
+    for _, el in it:
+        el.tag = el.tag.split('}', 1)[-1]
+
+
+def find_root(context, source):
+    try:
+        it = ET.iterparse(source)
+        strip_namespaces(it)
+        root = it.root
+    except BaseException:
+        if context is None:
+            print('ERROR: file: ' + source + ' does not contain valid XML data!')
+        else:
+            context.error('file: ' + source + ' does not contain valid XML data!')
+        return None
+    return root
+
+
+def parse_value(xml_obj, cast_func=str):
+    return cast_func(xml_obj.text)
+
+
+def create_value(value, parent, identifier):
+    xml_obj = create_node(parent, identifier)
+    xml_obj.text = str(value)
+
+
+def parse_objects(parent, name, parse_func, par1=None):
+    result = []
+    objects = parent.findall(name)
+    if not objects:
+        return result
+    for obj in objects:
+        if par1 is not None:
+            result.append(parse_func(obj, par1))
+        else:
+            result.append(parse_func(obj))
+    return result
+
+
+def create_object_list(parent, name, objects, write_func, par1=None):
+    xml_objects_list = create_node(parent, name)
+    for obj in objects:
+        if par1 is not None:
+            write_func(obj, xml_objects_list, par1)
+        else:
+            write_func(obj, xml_objects_list)
+
+
+def format(value):
+    return '{:.6f}'.format(value)
+
+
+def parse_vector2(xml_vector2):
+    return Vector((
+        float(xml_vector2.get('X', 0.0)),
+        float(xml_vector2.get('Y', 0.0))))
+
+
+def create_vector2(vec2, parent, name):
+    vector = create_node(parent, name)
+    vector.set('X', format(vec2.x))
+    vector.set('Y', format(vec2.y))
+
+
+def parse_vector(xml_vector):
+    return Vector((
+        float(xml_vector.get('X', 0.0)),
+        float(xml_vector.get('Y', 0.0)),
+        float(xml_vector.get('Z', 0.0))))
+
+
+def create_vector(vec, parent, name):
+    vector = create_node(parent, name)
+    vector.set('X', format(vec.x))
+    vector.set('Y', format(vec.y))
+    vector.set('Z', format(vec.z))