Many msh files (e.g. those in BFX) have multiple models assigned to the same index (MNDX). Indices should be linked only to the first model that uses them to ensure proper skinning.

addons/io_scene_swbf_msh/__init__.py

@@ -1,8 +1,8 @@
 bl_info = {
     'name': 'SWBF .msh Import-Export',
-    'author': 'Will Snyder, PrismaticFlower',
+    'author': 'Will Snyder, SleepKiller',
-    "version": (1, 3, 3),
+    "version": (1, 0, 0),
-    'blender': (4, 3, 2),
+    'blender': (2, 80, 0),
     'location': 'File > Import-Export',
     'description': 'Export as SWBF .msh file',
     'warning': '',
@@ -162,14 +162,14 @@ def menu_func_export(self, context):
 
 
 class ImportMSH(Operator, ImportHelper):
-    """ Import SWBF .msh file(s). """
+    """ Import an SWBF .msh file. """
 
     bl_idname = "swbf_msh.import"
     bl_label = "Import SWBF .msh File(s)"
     filename_ext = ".msh"
 
     files: CollectionProperty(
-            name="File Path(s)",
+            name="File Path",
             type=bpy.types.OperatorFileListElement,
             )
 
@@ -181,7 +181,7 @@ class ImportMSH(Operator, ImportHelper):
 
     animation_only: BoolProperty(
         name="Import Animation(s)",
-        description="Import one or more animations from the selected files and append each as a new Action to currently selected Armature.",
+        description="Import on or more animations from the selected files and append each as a new Action to currently selected Armature.",
         default=False
     )
 

addons/io_scene_swbf_msh/chunked_file_reader.py

@@ -138,9 +138,6 @@ class Reader:
     def how_much_left(self, pos):
         return self.end_pos - pos
 
-    def bytes_remaining(self):
-        return self.end_pos - self.file.tell()
-
     def skip_until(self, header):
         while (self.could_have_child() and header not in self.peak_next_header()):
             self.skip_bytes(1)

addons/io_scene_swbf_msh/msh_anim_gather.py

@@ -67,7 +67,7 @@ def extract_anim(armature: bpy.types.Armature, root_name: str) -> Animation:
 
     for frame in range(num_frames):
         
-        frame_time = int(framerange.x + frame * increment)
+        frame_time = framerange.x + frame * increment
         bpy.context.scene.frame_set(frame_time)
 
         for keyable_bone in keyable_bones:

addons/io_scene_swbf_msh/msh_anim_to_blend.py

@@ -32,6 +32,7 @@ def extract_and_apply_anim(filename : str, scene : Scene):
 
     if scene.animation is None:
         raise Exception("No animation found in msh file!")
+    
     else:
         head, tail = os.path.split(filename)
         anim_name = tail.split(".")[0]
@@ -39,10 +40,6 @@ def extract_and_apply_anim(filename : str, scene : Scene):
         if anim_name in bpy.data.actions:
             bpy.data.actions.remove(bpy.data.actions[anim_name], do_unlink=True)
 
-            for nt in arma.animation_data.nla_tracks:
-                if anim_name == nt.strips[0].name:
-                    arma.animation_data.nla_tracks.remove(nt)
-
         action = bpy.data.actions.new(anim_name)
         action.use_fake_user = True
 
@@ -106,5 +103,4 @@ def extract_and_apply_anim(filename : str, scene : Scene):
                     fcurve_loc_z.keyframe_points.insert(i,t.z)
 
         arma.animation_data.action = action
-        track = arma.animation_data.nla_tracks.new()
+
-        track.strips.new(action.name, int(action.frame_range[0]), action)

addons/io_scene_swbf_msh/msh_material_operators.py

@@ -180,10 +180,8 @@ to provide an exact emulation"""
 
             texture_input_nodes.append(texImage)
 
-            specular_key = "Specular" if bpy.app.version < (4, 0, 0) else "Specular IOR Level"
-
             bsdf.inputs["Roughness"].default_value = 1.0
-            bsdf.inputs[specular_key].default_value = 0.0
+            bsdf.inputs["Specular"].default_value = 0.0
 
             material.use_backface_culling = not bool(mat_props.doublesided)
 

addons/io_scene_swbf_msh/msh_mesh_to_blend.py

@@ -40,7 +40,6 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
     vertex_positions = []
     vertex_uvs = []
     vertex_normals = []
-    vertex_colors = []
 
     # Keeps track of which vertices each group of weights affects
     # i.e. maps offset of vertices -> weights that affect them
@@ -59,7 +58,6 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
 
 
     if model.geometry:
-        geometry_has_colors = any(segment.colors for segment in model.geometry)
 
         for segment in model.geometry:
 
@@ -78,11 +76,6 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
             if segment.normals:
                 vertex_normals += [tuple(convert_vector_space(n)) for n in segment.normals]
 
-            if segment.colors:
-                vertex_colors.extend(segment.colors)
-            elif geometry_has_colors:
-                [vertex_colors.extend([0.0, 0.0, 0.0, 1.0]) for _ in range(len(segment.positions))]
-            
             if segment.weights:
                 vertex_weights_offsets[polygon_index_offset] = segment.weights
 
@@ -118,6 +111,7 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
         blender_mesh.vertices.add(len(vertex_positions))
         blender_mesh.vertices.foreach_set("co", [component for vertex_position in vertex_positions for component in vertex_position])
 
+
         # LOOPS 
 
         flat_indices = [index for polygon in polygons for index in polygon]
@@ -128,16 +122,13 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
         blender_mesh.loops.foreach_set("vertex_index", flat_indices)
 
         # Normals
+        blender_mesh.create_normals_split()
         blender_mesh.loops.foreach_set("normal", [component for i in flat_indices for component in vertex_normals[i]])
 
         # UVs
         blender_mesh.uv_layers.new(do_init=False)
         blender_mesh.uv_layers[0].data.foreach_set("uv", [component for i in flat_indices for component in vertex_uvs[i]])
 
-        # Colors
-        if geometry_has_colors:
-            blender_mesh.color_attributes.new("COLOR0", "FLOAT_COLOR", "POINT")
-            blender_mesh.color_attributes[0].data.foreach_set("color", vertex_colors)
 
 
         # POLYGONS/FACES
@@ -174,6 +165,7 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
         reset_normals = [0.0] * (len(blender_mesh.loops) * 3)
         blender_mesh.loops.foreach_get("normal", reset_normals)
         blender_mesh.normals_split_custom_set(tuple(zip(*(iter(reset_normals),) * 3)))
+        blender_mesh.use_auto_smooth = True
 
 
     blender_mesh_object = bpy.data.objects.new(model.name, blender_mesh)
@@ -196,3 +188,4 @@ def model_to_mesh_object(model: Model, scene : Scene, materials_map : Dict[str,
 
 
     return blender_mesh_object
+

addons/io_scene_swbf_msh/msh_model_gather.py

@@ -179,7 +179,7 @@ def create_mesh_geometry(mesh: bpy.types.Mesh, valid_vgroup_indices: Set[int]) -
     vertex_remap: List[Dict[Tuple[int, int], int]] = [dict() for i in range(material_count)]
     polygons: List[Set[int]] = [set() for i in range(material_count)]
 
-    if mesh.color_attributes.active_color is not None:
+    if mesh.vertex_colors.active is not None:
         for segment in segments:
             segment.colors = []
 
@@ -215,10 +215,7 @@ def create_mesh_geometry(mesh: bpy.types.Mesh, valid_vgroup_indices: Set[int]) -
                 yield mesh.uv_layers.active.data[loop_index].uv.y
 
             if segment.colors is not None:
-                active_color = mesh.color_attributes.active_color
+                for v in mesh.vertex_colors.active.data[loop_index].color:
-                data_index = loop_index if active_color.domain == "CORNER" else vertex_index
-
-                for v in mesh.color_attributes.active_color.data[data_index].color:
                     yield v
 
             if segment.weights is not None:
@@ -248,10 +245,7 @@ def create_mesh_geometry(mesh: bpy.types.Mesh, valid_vgroup_indices: Set[int]) -
             segment.texcoords.append(mesh.uv_layers.active.data[loop_index].uv.copy())
 
         if segment.colors is not None:
-            active_color = mesh.color_attributes.active_color
+            segment.colors.append(list(mesh.vertex_colors.active.data[loop_index].color))
-            data_index = loop_index if active_color.domain == "CORNER" else vertex_index
-
-            segment.colors.append(list(active_color.data[data_index].color))
 
         if segment.weights is not None:
             groups = mesh.vertices[vertex_index].groups

addons/io_scene_swbf_msh/msh_scene_read.py

@@ -165,22 +165,18 @@ def _read_matd(matd: Reader) -> Material:
 
         elif next_header == "TX0D":
             with matd.read_child() as tx0d:
-                if tx0d.bytes_remaining() > 0:
                 mat.texture0 = tx0d.read_string()
 
         elif next_header == "TX1D":
             with matd.read_child() as tx1d:
-                if tx1d.bytes_remaining() > 0:
                 mat.texture1 = tx1d.read_string()
 
         elif next_header == "TX2D":
             with matd.read_child() as tx2d:
-                if tx2d.bytes_remaining() > 0:
                 mat.texture2 = tx2d.read_string()
 
         elif next_header == "TX3D":
             with matd.read_child() as tx3d:
-                if tx3d.bytes_remaining() > 0:
                 mat.texture3 = tx3d.read_string()
 
         else:

addons/io_scene_swbf_msh/msh_utilities.py

@@ -39,9 +39,12 @@ def pack_color(color) -> int:
     return packed
 
 def unpack_color(color: int) -> List[float]:
-    r = (color >> 16 & 0xFF) / 255.0
+
-    g = (color >> 8  & 0xFF) / 255.0
+    mask = int(0x000000ff)
-    b = (color >> 0  & 0xFF) / 255.0
+
-    a = (color >> 24 & 0xFF) / 255.0
+    r = (color & (mask << 16)) / 255.0
+    g = (color & (mask << 8)) / 255.0
+    b = (color & mask) / 255.0
+    a = (color & (mask << 24)) / 255.0
 
     return [r,g,b,a]