diff options
Diffstat (limited to 'rigify/utils/layers.py')
| -rw-r--r-- | rigify/utils/layers.py | 68 |
1 files changed, 44 insertions, 24 deletions
diff --git a/rigify/utils/layers.py b/rigify/utils/layers.py index d5c229af..d1f56e90 100644 --- a/rigify/utils/layers.py +++ b/rigify/utils/layers.py @@ -2,6 +2,12 @@ import bpy +from typing import TYPE_CHECKING, Sequence, Optional, Mapping +from bpy.types import Bone, UILayout, Object, PoseBone, Armature + +if TYPE_CHECKING: + from ..base_rig import BaseRig + ORG_LAYER = [n == 31 for n in range(0, 32)] # Armature layer that original bones should be moved to. MCH_LAYER = [n == 30 for n in range(0, 32)] # Armature layer that mechanism bones should be moved to. @@ -9,20 +15,20 @@ DEF_LAYER = [n == 29 for n in range(0, 32)] # Armature layer that deformation b ROOT_LAYER = [n == 28 for n in range(0, 32)] # Armature layer that root bone should be moved to. -def get_layers(layers): +def get_layers(layers) -> list[bool]: """ Does its best to extract a set of layers from any data thrown at it. """ if type(layers) == int: return [x == layers for x in range(0, 32)] elif type(layers) == str: - s = layers.split(",") - l = [] - for i in s: + items = layers.split(",") + layers = [] + for i in items: try: - l += [int(float(i))] + layers += [int(float(i))] except ValueError: pass - return [x in l for x in range(0, 32)] + return [x in layers for x in range(0, 32)] elif type(layers) == tuple or type(layers) == list: return [x in layers for x in range(0, 32)] else: @@ -34,20 +40,20 @@ def get_layers(layers): return [x in layers for x in range(0, 32)] -def set_bone_layers(bone, layers, combine=False): +def set_bone_layers(bone: Bone, layers: Sequence[bool], combine=False): if combine: - bone.layers = [ a or b for a, b in zip(bone.layers, layers) ] + bone.layers = [a or b for a, b in zip(bone.layers, layers)] else: bone.layers = layers -#============================================= +############################################## # UI utilities -#============================================= +############################################## -def layout_layer_buttons(layout, params, option, active_layers): - "Draw a layer selection button UI with certain layers marked with dots." +def layout_layer_buttons(layout: UILayout, params, option: str, active_layers: Sequence[bool]): + """Draw a layer selection button UI with certain layers marked with dots.""" outer = layout.row() for x in [0, 8]: @@ -64,36 +70,46 @@ def layout_layer_buttons(layout, params, option, active_layers): class ControlLayersOption: - def __init__(self, name, toggle_name=None, toggle_default=True, description="Set of control layers"): + def __init__(self, name: str, + toggle_name: Optional[str] = None, + toggle_default=True, description="Set of control layers"): self.name = name self.toggle_default = toggle_default self.description = description self.toggle_option = self.name+'_layers_extra' self.layers_option = self.name+'_layers' - self.toggle_name = toggle_name if toggle_name else "Assign " + self.name.title() + " Layers" - def get(self, params): + if toggle_name: + self.toggle_name = toggle_name + else: + self.toggle_name = "Assign " + self.name.title() + " Layers" + + def get(self, params) -> Optional[list[bool]]: if getattr(params, self.toggle_option): return list(getattr(params, self.layers_option)) else: return None - def assign(self, params, bone_set, bone_list, combine=False): + def assign(self, params, + bone_set: Object | Mapping[str, Bone | PoseBone], + bone_list: Sequence[str], + combine=False): layers = self.get(params) - if isinstance(bone_set, bpy.types.Object): + if isinstance(bone_set, Object): + assert isinstance(bone_set.data, Armature) bone_set = bone_set.data.bones if layers: for name in bone_list: bone = bone_set[name] - if isinstance(bone, bpy.types.PoseBone): + if isinstance(bone, PoseBone): bone = bone.bone set_bone_layers(bone, layers, combine) - def assign_rig(self, rig, bone_list, combine=False, priority=None): + def assign_rig(self, rig: 'BaseRig', bone_list: Sequence[str], combine=False, priority=None): layers = self.get(rig.params) bone_set = rig.obj.data.bones @@ -122,7 +138,7 @@ class ControlLayersOption: setattr(params, self.layers_option, prop_layers) - def parameters_ui(self, layout, params): + def parameters_ui(self, layout: UILayout, params): box = layout.box() box.prop(params, self.toggle_option) @@ -136,8 +152,10 @@ class ControlLayersOption: layout_layer_buttons(box, params, self.layers_option, active_layers) -ControlLayersOption.FK = ControlLayersOption('fk', description="Layers for the FK controls to be on") -ControlLayersOption.TWEAK = ControlLayersOption('tweak', description="Layers for the tweak controls to be on") +ControlLayersOption.FK = ControlLayersOption( + 'fk', description="Layers for the FK controls to be on") +ControlLayersOption.TWEAK = ControlLayersOption( + 'tweak', description="Layers for the tweak controls to be on") ControlLayersOption.EXTRA_IK = ControlLayersOption( 'extra_ik', toggle_default=False, @@ -146,8 +164,10 @@ ControlLayersOption.EXTRA_IK = ControlLayersOption( ) # Layer parameters used by the super_face rig. -ControlLayersOption.FACE_PRIMARY = ControlLayersOption('primary', description="Layers for the primary controls to be on") -ControlLayersOption.FACE_SECONDARY = ControlLayersOption('secondary', description="Layers for the secondary controls to be on") +ControlLayersOption.FACE_PRIMARY = ControlLayersOption( + 'primary', description="Layers for the primary controls to be on") +ControlLayersOption.FACE_SECONDARY = ControlLayersOption( + 'secondary', description="Layers for the secondary controls to be on") # Layer parameters used by the skin rigs ControlLayersOption.SKIN_PRIMARY = ControlLayersOption( |