get_controller_data more intelligently for anim import

Author: HENDRIX-ZT2

io_scene_niftools/modules/nif_import/animation/__init__.py

@@ -55,6 +55,18 @@ def __init__(self):
         # and still be able to access existing actions from this run
         self.actions = {}
 
+    @staticmethod
+    def get_controller_data(ctrl):
+        """Return data for ctrl, look in interpolator (for newer games) or directly on ctrl"""
+        if ctrl.interpolator:
+            data = ctrl.interpolator.data
+        else:
+            data = ctrl.data
+        # these have their data set as a KeyGroup on data
+        if isinstance(data, (NifFormat.NiBoolData, NifFormat.NiFloatData, NifFormat.NiPosData)):
+            return data.data
+        return data
+
     @staticmethod
     def get_keys_values(items):
         """Returns list of times and keys for an array 'items' with key elements having 'time' and 'value' attributes"""

io_scene_niftools/modules/nif_import/animation/material.py

@@ -69,8 +69,9 @@ def import_material_alpha_controller(self, b_material, n_material):
         NifLog.info("Importing alpha controller")
 
         b_mat_action = self.create_action(b_material, "MaterialAction")
-        interp = self.get_b_interp_from_n_interp(n_ctrl.data.data.interpolation)
-        times, keys = self.get_keys_values(n_ctrl.data.data.keys)
+        n_ctrl_data = self.get_controller_data(n_ctrl)
+        interp = self.get_b_interp_from_n_interp(n_ctrl_data.interpolation)
+        times, keys = self.get_keys_values(n_ctrl_data.keys)
         # key needs to be RGB due to current representation in blender
         keys = [(v, v, v) for v in keys]
         self.add_keys(b_mat_action, "niftools.emissive_alpha", range(3), n_ctrl.flags, times, keys, interp)
@@ -85,8 +86,9 @@ def import_material_color_controller(self, b_material, n_material, b_channel, n_
             return
         NifLog.info(f"Importing material color controller for target color {n_target_color} into blender channel {b_channel}")
         b_mat_action = self.create_action(b_material, "MaterialAction")
-        interp = self.get_b_interp_from_n_interp(n_ctrl.data.data.interpolation)
-        times, keys = self.get_keys_values(n_ctrl.data.data.keys)
+        n_ctrl_data = self.get_controller_data(n_ctrl)
+        interp = self.get_b_interp_from_n_interp(n_ctrl_data.interpolation)
+        times, keys = self.get_keys_values(n_ctrl_data.keys)
         self.add_keys(b_mat_action, b_channel, range(3), n_ctrl.flags, times, keys, interp)
 
     def import_material_uv_controller(self, b_material, n_geom):
@@ -97,7 +99,8 @@ def import_material_uv_controller(self, b_material, n_geom):
             return
         NifLog.info("Importing UV controller")
 
-        if not any(n_uvgroup.keys for n_uvgroup in n_ctrl.data.uv_groups):
+        n_ctrl_data = self.get_controller_data(n_ctrl)
+        if not any(n_uvgroup.keys for n_uvgroup in n_ctrl_data.uv_groups):
             return
 
         b_mat_action = self.create_action(b_material.node_tree, "MaterialAction")

io_scene_niftools/modules/nif_import/animation/morph.py

@@ -117,8 +117,6 @@ def import_egm_morphs(self, b_obj):
         sk_basis = b_obj.shape_key_add(name="Basis")
         b_mesh.shape_keys.use_relative = False
 
-        # TODO: I'm not entirely sure that changing the morphs to f-strings won't
-        # TODO: break anything. They _shouldn't_.
         morphs = ([(morph, f"EGM SYM {i}") for i, morph in enumerate(sym_morphs)] +
                   [(morph, f"EGM ASYM {i}") for i, morph in enumerate(asym_morphs)])
 

io_scene_niftools/modules/nif_import/animation/object.py

@@ -54,5 +54,7 @@ def import_visibility(self, n_node, b_obj):
             return
         NifLog.info("Importing vis controller")
         b_obj_action = self.create_action(b_obj, f"{b_obj.name}-Anim")
-        times, keys = self.get_keys_values(n_vis_ctrl.data.keys)
+
+        n_ctrl_data = self.get_controller_data(n_vis_ctrl)
+        times, keys = self.get_keys_values(n_ctrl_data.keys)
         self.add_keys(b_obj_action, "hide_viewport", (0,), n_vis_ctrl.flags, times, keys, "CONSTANT")

io_scene_niftools/modules/nif_import/animation/transform.py

@@ -246,12 +246,8 @@ def import_keyframe_controller(self, n_kfc, b_armature, b_target, b_action_name)
             b_action = self.create_action(b_target, f"{b_action_name}_{b_target.name}")
             bone_name = None
 
-        # transform controllers (dartgun.nif)
-        if isinstance(n_kfc, NifFormat.NiTransformController):
-            if n_kfc.interpolator:
-                n_kfd = n_kfc.interpolator.data
         # B-spline curve import
-        elif isinstance(n_kfc, NifFormat.NiBSplineInterpolator):
+        if isinstance(n_kfc, NifFormat.NiBSplineInterpolator):
             # Bsplines are Bezier curves
             interp = "BEZIER"
             if isinstance(n_kfc, NifFormat.NiBSplineCompFloatInterpolator):
@@ -271,9 +267,7 @@ def import_keyframe_controller(self, n_kfc, b_armature, b_target, b_action_name)
         elif isinstance(n_kfc, NifFormat.NiMultiTargetTransformController):
             # not sure what this is used for
             return
-        else:
-            # ZT2 & Fallout
-            n_kfd = n_kfc.data
+        n_kfd = self.get_controller_data(n_kfc)
         # ZT2 - get extrapolation for every kfc
         if isinstance(n_kfc, NifFormat.NiKeyframeController):
             flags = n_kfc.flags