Fixed duplicate code issue

# Conflicts:
#	io_scene_psk_psa/psa/importer.py

README.md

@@ -5,11 +5,12 @@
 
 This Blender addon allows you to import and export meshes and animations to and from the [PSK and PSA file formats](https://wiki.beyondunreal.com/PSK_%26_PSA_file_formats) used in many versions of the Unreal Engine.
 
-## Compatibility
+# Compatibility
 
 | Blender Version                                            | Addon Version                                                                  | Long Term Support |
-|--------------------------------------------------------------|--------------------------------------------------------------------------------|-------------------|
+|------------------------------------------------------------|--------------------------------------------------------------------------------|-------------------|
-| 4.0+                                                         | [latest](https://github.com/DarklightGames/io_scene_psk_psa/releases/latest)   | TBD               |
+| [4.1](https://www.blender.org/download/releases/4-1/)      | [latest](https://github.com/DarklightGames/io_scene_psk_psa/releases/latest)   | TBD               |
+| [4.0](https://www.blender.org/download/releases/4-0/)      | [6.2.1](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/6.2.1) | TBD               |                                      
 | [3.4 - 3.6](https://www.blender.org/download/lts/3-6/)     | [5.0.6](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/5.0.6) | ✅️ June 2025      |
 | [2.93 - 3.3](https://www.blender.org/download/releases/3-3/) | [4.3.0](https://github.com/DarklightGames/io_scene_psk_psa/releases/tag/4.3.0) | ✅️ September 2024 |
 

io_scene_psk_psa/__init__.py

@@ -3,8 +3,8 @@ from bpy.app.handlers import persistent
 bl_info = {
     'name': 'PSK/PSA Importer/Exporter',
     'author': 'Colin Basnett, Yurii Ti',
-    'version': (6, 2, 1),
+    'version': (7, 0, 0),
-    'blender': (4, 0, 0),
+    'blender': (4, 1, 0),
     'description': 'PSK/PSA Import/Export (.psk/.psa)',
     'warning': '',
     'doc_url': 'https://github.com/DarklightGames/io_scene_psk_psa',

io_scene_psk_psa/psa/config.py

@@ -14,7 +14,7 @@ class PsaConfig:
 
 
 def _load_config_file(file_path: str) -> ConfigParser:
-    '''
+    """
     UEViewer exports a dialect of INI files that is not compatible with Python's ConfigParser.
     Specifically, it allows values in this format:
 
@@ -24,7 +24,7 @@ def _load_config_file(file_path: str) -> ConfigParser:
 
     This is not allowed in Python's ConfigParser, which requires a '=' character after each key name.
     To work around this, we'll modify the file to add the '=' character after each key name if it is missing.
-    '''
+    """
     with open(file_path, 'r') as f:
         lines = f.read().split('\n')
 
@@ -41,7 +41,7 @@ def _load_config_file(file_path: str) -> ConfigParser:
 def _get_bone_flags_from_value(value: str) -> int:
     match value:
         case 'all':
-            return (REMOVE_TRACK_LOCATION | REMOVE_TRACK_ROTATION)
+            return REMOVE_TRACK_LOCATION | REMOVE_TRACK_ROTATION
         case 'trans':
             return REMOVE_TRACK_LOCATION
         case 'rot':

io_scene_psk_psa/psa/export/operators.py

@@ -91,14 +91,15 @@ def update_actions_and_timeline_markers(context: Context, armature: Armature):
 
 
 def get_sequence_fps(context: Context, fps_source: str, fps_custom: float, actions: Iterable[Action]) -> float:
-    if fps_source == 'SCENE':
+    match fps_source:
+        case 'SCENE':
             return context.scene.render.fps
-    elif fps_source == 'CUSTOM':
+        case 'CUSTOM':
             return fps_custom
-    elif fps_source == 'ACTION_METADATA':
+        case 'ACTION_METADATA':
             # Get the minimum value of action metadata FPS values.
             return min([action.psa_export.fps for action in actions])
-    else:
+        case _:
             raise RuntimeError(f'Invalid FPS source "{fps_source}"')
 
 

io_scene_psk_psa/psa/export/ui.py

@@ -32,7 +32,6 @@ class PSA_UL_export_sequences(UIList):
         subrow = row.row(align=True)
         subrow.prop(pg, 'sequence_filter_name', text='')
         subrow.prop(pg, 'sequence_use_filter_invert', text='', icon='ARROW_LEFTRIGHT')
-        # subrow.prop(pg, 'sequence_use_filter_sort_reverse', text='', icon='SORT_ASC')
 
         if pg.sequence_source == 'ACTIONS':
             subrow = row.row(align=True)
@@ -44,7 +43,6 @@ class PSA_UL_export_sequences(UIList):
         pg = getattr(context.scene, 'psa_export')
         actions = getattr(data, prop)
         flt_flags = filter_sequences(pg, actions)
-        # flt_neworder = bpy.types.UI_UL_list.sort_items_by_name(actions, 'name')
         flt_neworder = list(range(len(actions)))
         return flt_flags, flt_neworder
 

io_scene_psk_psa/psa/import_/operators.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 
 from bpy.props import StringProperty
-from bpy.types import Operator, Event, Context
+from bpy.types import Operator, Event, Context, FileHandler
 from bpy_extras.io_utils import ImportHelper
 
 from .properties import get_visible_sequences
@@ -89,23 +89,6 @@ class PSA_OT_import_sequences_deselect_all(Operator):
         return {'FINISHED'}
 
 
-class PSA_OT_import_select_file(Operator):
-    bl_idname = 'psa_import.select_file'
-    bl_label = 'Select'
-    bl_options = {'INTERNAL'}
-    bl_description = 'Select a PSA file from which to import animations'
-    filepath: StringProperty(subtype='FILE_PATH')
-    filter_glob: StringProperty(default='*.psa', options={'HIDDEN'})
-
-    def execute(self, context):
-        getattr(context.scene, 'psa_import').psa_file_path = self.filepath
-        return {'FINISHED'}
-
-    def invoke(self, context, event):
-        context.window_manager.fileselect_add(self)
-        return {'RUNNING_MODAL'}
-
-
 def load_psa_file(context, filepath: str):
     pg = context.scene.psa_import
     pg.sequence_list.clear()
@@ -207,18 +190,18 @@ class PSA_OT_import(Operator, ImportHelper):
         layout = self.layout
         pg = getattr(context.scene, 'psa_import')
 
+        sequences_header, sequences_panel = layout.panel('sequences_panel_id', default_closed=False)
+        sequences_header.label(text='Sequences')
+
+        if sequences_panel:
             if pg.psa_error:
-            row = layout.row()
+                row = sequences_panel.row()
                 row.label(text='Select a PSA file', icon='ERROR')
             else:
-            box = layout.box()
-
-            box.label(text=f'Sequences ({len(pg.sequence_list)})', icon='ARMATURE_DATA')
-
                 # Select buttons.
                 rows = max(3, min(len(pg.sequence_list), 10))
 
-            row = box.row()
+                row = sequences_panel.row()
                 col = row.column()
 
                 row2 = col.row(align=True)
@@ -230,44 +213,59 @@ class PSA_OT_import(Operator, ImportHelper):
                 col = col.row()
                 col.template_list('PSA_UL_import_sequences', '', pg, 'sequence_list', pg, 'sequence_list_index', rows=rows)
 
-        col = layout.column(heading='')
+            col = sequences_panel.column(heading='')
             col.use_property_split = True
             col.use_property_decorate = False
+            col.prop(pg, 'fps_source')
+            if pg.fps_source == 'CUSTOM':
+                col.prop(pg, 'fps_custom')
             col.prop(pg, 'should_overwrite')
+            col.prop(pg, 'should_use_action_name_prefix')
+            if pg.should_use_action_name_prefix:
+                col.prop(pg, 'action_name_prefix')
 
-        col = layout.column(heading='Write')
+        data_header, data_panel = layout.panel('data_panel_id', default_closed=False)
+        data_header.label(text='Data')
+
+        if data_panel:
+            col = data_panel.column(heading='Write')
             col.use_property_split = True
             col.use_property_decorate = False
             col.prop(pg, 'should_write_keyframes')
             col.prop(pg, 'should_write_metadata')
 
-        col = layout.column()
+            if pg.should_write_keyframes:
+                col = col.column(heading='Keyframes')
+                col.use_property_split = True
+                col.use_property_decorate = False
+                col.prop(pg, 'should_convert_to_samples')
+
+        advanced_header, advanced_panel = layout.panel('advanced_panel_id', default_closed=True)
+        advanced_header.label(text='Advanced')
+
+        if advanced_panel:
+            col = advanced_panel.column()
             col.use_property_split = True
             col.use_property_decorate = False
             col.prop(pg, 'bone_mapping_mode')
 
-        if pg.should_write_keyframes:
+            col = advanced_panel.column(heading='Options')
-            col = layout.column(heading='Keyframes')
-            col.use_property_split = True
-            col.use_property_decorate = False
-            col.prop(pg, 'should_convert_to_samples')
-            col.separator()
-            # FPS
-            col.prop(pg, 'fps_source')
-            if pg.fps_source == 'CUSTOM':
-                col.prop(pg, 'fps_custom')
-
-        col = layout.column(heading='Options')
             col.use_property_split = True
             col.use_property_decorate = False
             col.prop(pg, 'should_use_fake_user')
             col.prop(pg, 'should_stash')
             col.prop(pg, 'should_use_config_file')
 
-        col.prop(pg, 'should_use_action_name_prefix')
 
-        if pg.should_use_action_name_prefix:
+class PSA_FH_import(FileHandler):
-            col.prop(pg, 'action_name_prefix')
+    bl_idname = 'PSA_FH_import'
+    bl_label = 'File handler for Unreal PSA import'
+    bl_import_operator = 'psa_import.import'
+    bl_file_extensions = '.psa'
+
+    @classmethod
+    def poll_drop(cls, context: Context):
+        return context.area and context.area.type == 'VIEW_3D'
 
 
 classes = (
@@ -275,5 +273,5 @@ classes = (
     PSA_OT_import_sequences_deselect_all,
     PSA_OT_import_sequences_from_text,
     PSA_OT_import,
-    PSA_OT_import_select_file,
+    PSA_FH_import,
 )

io_scene_psk_psa/psa/import_/properties.py

@@ -76,13 +76,13 @@ class PSA_PG_import(PropertyGroup):
     )
     fps_source: EnumProperty(name='FPS Source', items=(
         ('SEQUENCE', 'Sequence', 'The sequence frame rate matches the original frame rate', 'ACTION', 0),
-        ('SCENE', 'Scene', 'The sequence frame rate dilates to match that of the scene', 'SCENE_DATA', 1),
+        ('SCENE', 'Scene', 'The sequence is resampled to the frame rate of the scene', 'SCENE_DATA', 1),
-        ('CUSTOM', 'Custom', 'The sequence frame rate dilates to match a custom frame rate', 2),
+        ('CUSTOM', 'Custom', 'The sequence is resampled to a custom frame rate', 2),
     ))
     fps_custom: FloatProperty(
         default=30.0,
         name='Custom FPS',
-        description='The frame rate to which the imported actions will be converted',
+        description='The frame rate to which the imported sequences will be resampled to',
         options=empty_set,
         min=1.0,
         soft_min=1.0,

io_scene_psk_psa/psa/importer.py

@@ -46,16 +46,16 @@ def _calculate_fcurve_data(import_bone: ImportBone, key_data: typing.Iterable[fl
     key_location = Vector(key_data[4:])
     q = import_bone.post_rotation.copy()
     q.rotate(import_bone.original_rotation)
-    quat = q
+    rotation = q
     q = import_bone.post_rotation.copy()
     if import_bone.parent is None:
         q.rotate(key_rotation.conjugated())
     else:
         q.rotate(key_rotation)
-    quat.rotate(q.conjugated())
+    rotation.rotate(q.conjugated())
-    loc = key_location - import_bone.original_location
+    location = key_location - import_bone.original_location
-    loc.rotate(import_bone.post_rotation.conjugated())
+    location.rotate(import_bone.post_rotation.conjugated())
-    return quat.w, quat.x, quat.y, quat.z, loc.x, loc.y, loc.z
+    return rotation.w, rotation.x, rotation.y, rotation.z, location.x, location.y, location.z
 
 
 class PsaImportResult:
@@ -79,49 +79,48 @@ def _get_armature_bone_index_for_psa_bone(psa_bone_name: str, armature_bone_name
                 return armature_bone_index
     return None
 
-
+def _get_sample_frame_times(source_frame_count: int, frame_step: float) -> typing.Iterable[float]:
-def _resample_sequence_data_matrix(sequence_data_matrix: np.ndarray, time_step: float = 1.0) -> np.ndarray:
-    '''
-    Resamples the sequence data matrix to the target frame count.
-    @param sequence_data_matrix: FxBx7 matrix where F is the number of frames, B is the number of bones, and X is the
-    number of data elements per bone.
-    @param target_frame_count: The number of frames to resample to.
-    @return: The resampled sequence data matrix, or sequence_data_matrix if no resampling is necessary.
-    '''
-    def get_sample_times(source_frame_count: int, time_step: float) -> typing.Iterable[float]:
     # TODO: for correctness, we should also emit the target frame time as well (because the last frame can be a
     #  fractional frame).
     time = 0.0
     while time < source_frame_count - 1:
         yield time
-            time += time_step
+        time += frame_step
     yield source_frame_count - 1
 
-    if time_step == 1.0:
+def _resample_sequence_data_matrix(sequence_data_matrix: np.ndarray, frame_step: float = 1.0) -> np.ndarray:
+    """
+    Resamples the sequence data matrix to the target frame count.
+    @param sequence_data_matrix: FxBx7 matrix where F is the number of frames, B is the number of bones, and X is the
+    number of data elements per bone.
+    @param frame_step: The step between frames in the resampled sequence.
+    @return: The resampled sequence data matrix, or sequence_data_matrix if no resampling is necessary.
+    """
+    if frame_step == 1.0:
         # No resampling is necessary.
         return sequence_data_matrix
 
     source_frame_count, bone_count = sequence_data_matrix.shape[:2]
-    sample_times = list(get_sample_times(source_frame_count, time_step))
+    sample_frame_times = list(_get_sample_frame_times(source_frame_count, frame_step))
-    target_frame_count = len(sample_times)
+    target_frame_count = len(sample_frame_times)
     resampled_sequence_data_matrix = np.zeros((target_frame_count, bone_count, 7), dtype=float)
 
-    for sample_index, sample_time in enumerate(sample_times):
+    for sample_frame_index, sample_frame_time in enumerate(sample_frame_times):
-        frame_index = int(sample_time)
+        frame_index = int(sample_frame_time)
-        if sample_time % 1.0 == 0.0:
+        if sample_frame_time % 1.0 == 0.0:
             # Sample time has no fractional part, so just copy the frame.
-            resampled_sequence_data_matrix[sample_index, :, :] = sequence_data_matrix[frame_index, :, :]
+            resampled_sequence_data_matrix[sample_frame_index, :, :] = sequence_data_matrix[frame_index, :, :]
         else:
             # Sample time has a fractional part, so interpolate between two frames.
             next_frame_index = frame_index + 1
             for bone_index in range(bone_count):
                 source_frame_1_data = sequence_data_matrix[frame_index, bone_index, :]
                 source_frame_2_data = sequence_data_matrix[next_frame_index, bone_index, :]
-                factor = sample_time - frame_index
+                factor = sample_frame_time - frame_index
                 q = Quaternion((source_frame_1_data[:4])).slerp(Quaternion((source_frame_2_data[:4])), factor)
                 q.normalize()
                 l = Vector(source_frame_1_data[4:]).lerp(Vector(source_frame_2_data[4:]), factor)
-                resampled_sequence_data_matrix[sample_index, bone_index, :] = q.w, q.x, q.y, q.z, l.x, l.y, l.z
+                resampled_sequence_data_matrix[sample_frame_index, bone_index, :] = q.w, q.x, q.y, q.z, l.x, l.y, l.z
 
     return resampled_sequence_data_matrix
 
@@ -285,7 +284,7 @@ def import_psa(context: Context, psa_reader: PsaReader, armature_object: Object,
             # Resample the sequence data to the target FPS.
             # If the target frame count is the same as the source frame count, this will be a no-op.
             resampled_sequence_data_matrix = _resample_sequence_data_matrix(sequence_data_matrix,
-                                                                            time_step=sequence.fps / target_fps)
+                                                                            frame_step=sequence.fps / target_fps)
 
             # Write the keyframes out.
             # Note that the f-curve data consists of alternating time and value data.

io_scene_psk_psa/psa/reader.py

@@ -23,11 +23,11 @@ def _try_fix_cue4parse_issue_103(sequences) -> bool:
 
 
 class PsaReader(object):
-    '''
+    """
     This class reads the sequences and bone information immediately upon instantiation and holds onto a file handle.
     The keyframe data is not read into memory upon instantiation due to its potentially very large size.
     To read the key data for a particular sequence, call :read_sequence_keys.
-    '''
+    """
 
     def __init__(self, path):
         self.keys_data_offset: int = 0
@@ -43,11 +43,11 @@ class PsaReader(object):
         return self.psa.sequences
 
     def read_sequence_data_matrix(self, sequence_name: str) -> np.ndarray:
-        '''
+        """
         Reads and returns the data matrix for the given sequence.
         @param sequence_name: The name of the sequence.
         @return: An FxBx7 matrix where F is the number of frames, B is the number of bones.
-        '''
+        """
         sequence = self.psa.sequences[sequence_name]
         keys = self.read_sequence_keys(sequence_name)
         bone_count = len(self.bones)
@@ -60,12 +60,12 @@ class PsaReader(object):
         return matrix
 
     def read_sequence_keys(self, sequence_name: str) -> List[Psa.Key]:
-        '''
+        """
         Reads and returns the key data for a sequence.
 
         @param sequence_name: The name of the sequence.
         @return: A list of Psa.Keys.
-        '''
+        """
         # Set the file reader to the beginning of the keys data
         sequence = self.psa.sequences[sequence_name]
         data_size = sizeof(Psa.Key)

io_scene_psk_psa/psk/export/properties.py

@@ -3,6 +3,7 @@ from bpy.types import PropertyGroup, Material
 
 from ...types import PSX_PG_bone_collection_list_item
 
+empty_set = set()
 
 class PSK_PG_material_list_item(PropertyGroup):
     material: PointerProperty(type=Material)
@@ -12,7 +13,7 @@ class PSK_PG_material_list_item(PropertyGroup):
 class PSK_PG_export(PropertyGroup):
     bone_filter_mode: EnumProperty(
         name='Bone Filter',
-        options=set(),
+        options=empty_set,
         description='',
         items=(
             ('ALL', 'All', 'All bones will be exported'),

io_scene_psk_psa/psk/import_/operators.py

@@ -2,7 +2,7 @@ import os
 import sys
 
 from bpy.props import StringProperty, BoolProperty, EnumProperty, FloatProperty
-from bpy.types import Operator
+from bpy.types import Operator, FileHandler, Context
 from bpy_extras.io_utils import ImportHelper
 
 from ..importer import PskImportOptions, import_psk
@@ -11,6 +11,17 @@ from ..reader import read_psk
 empty_set = set()
 
 
+class PSK_FH_import(FileHandler):
+    bl_idname = 'PSK_FH_import'
+    bl_label = 'File handler for Unreal PSK/PSKX import'
+    bl_import_operator = 'import_scene.psk'
+    bl_file_extensions = '.psk;.pskx'
+
+    @classmethod
+    def poll_drop(cls, context: Context):
+        return context.area and context.area.type == 'VIEW_3D'
+
+
 class PSK_OT_import(Operator, ImportHelper):
     bl_idname = 'import_scene.psk'
     bl_label = 'Import'
@@ -132,10 +143,11 @@ class PSK_OT_import(Operator, ImportHelper):
         col.use_property_decorate = False
         col.prop(self, 'scale')
 
-        layout.prop(self, 'should_import_mesh')
+        mesh_header, mesh_panel = layout.panel('mesh_panel_id', default_closed=False)
+        mesh_header.prop(self, 'should_import_mesh')
 
-        if self.should_import_mesh:
+        if mesh_panel and self.should_import_mesh:
-            row = layout.row()
+            row = mesh_panel.row()
             col = row.column()
             col.use_property_split = True
             col.use_property_decorate = False
@@ -147,9 +159,11 @@ class PSK_OT_import(Operator, ImportHelper):
                 col.prop(self, 'vertex_color_space')
             col.prop(self, 'should_import_shape_keys', text='Shape Keys')
 
-        layout.prop(self, 'should_import_skeleton')
+        skeleton_header, skeleton_panel = layout.panel('skeleton_panel_id', default_closed=False)
-        if self.should_import_skeleton:
+        skeleton_header.prop(self, 'should_import_skeleton')
-            row = layout.row()
+
+        if skeleton_panel and self.should_import_skeleton:
+            row = skeleton_panel.row()
             col = row.column()
             col.use_property_split = True
             col.use_property_decorate = False
@@ -158,4 +172,5 @@ class PSK_OT_import(Operator, ImportHelper):
 
 classes = (
     PSK_OT_import,
+    PSK_FH_import,
 )

io_scene_psk_psa/psk/importer.py

@@ -231,8 +231,6 @@ def import_psk(psk: Psk, context, options: PskImportOptions) -> PskImportResult:
             for vertex_normal in psk.vertex_normals:
                 normals.append(tuple(vertex_normal))
             mesh_data.normals_split_custom_set_from_vertices(normals)
-            # TODO: This has been removed in 4.1!
-            mesh_data.use_auto_smooth = True
         else:
             mesh_data.shade_smooth()