Merge branch 'main' into cleanup

resources/translations/en_US.json

@@ -79,6 +79,15 @@
     "Quick_Access.label": "Quick Access",
     "Quick_Access.options": "Quick Access:",
     "Quick_Access.select_armature": "Select Armature:",
+    "Quick_Access.apply_armature_failed": "Applying armature as pose failed at the joining shapekeys back together stage!",
+    "Quick_Access.apply_pose_as_rest.desc": "Makes current pose the default rest pose.",
+    "Quick_Access.stop_pose_mode.desc": "Exits pose mode and clears all posing on all visible bones in pose mode.",
+    "Quick_Access.apply_pose_as_rest.label": "Apply Pose as Rest Pose",
+    "Quick_Access.apply_pose_as_shapekey.desc": "Makes the current pose a shapekey that can be activated later.\nThis is good for applying a jaw open position as a shapekey for facial movements.",
+    "Quick_Access.apply_pose_as_shapekey.label": "Apply Pose as Shapekey",
+    "Quick_Access.stop_pose_mode.label": "Exit Pose Mode",
+    "Quick_Access.start_pose_mode.desc": "Starts pose mode for the armature targeted by Avatar Toolkit.",
+    "Quick_Access.start_pose_mode.label": "Start Pose Mode",
     "Quick_Access.select_export.label": "Select Export Method",
     "Quick_Access.select_export_resonite.label": "Resonite",
     "Settings.label": "Settings",

ui/quick_access.py

@@ -2,17 +2,16 @@ import bpy
 from ..core.register import register_wrap
 from .panel import AvatarToolKit_PT_AvatarToolkitPanel, CATEGORY_NAME
 from ..core.export_resonite import AvatarToolKit_OT_ExportResonite
-from bpy.types import Context
+from bpy.types import Context, Mesh, Panel, Operator
 from ..functions.translations import t
 
 from ..core.import_pmx import import_pmx
 from ..core.import_pmd import import_pmd
 from ..functions.import_anything import AvatarToolKit_OT_ImportAnyModel
-from ..core.common import get_selected_armature, set_selected_armature
+from ..core.common import get_selected_armature, set_selected_armature, get_all_meshes
 
 @register_wrap
-@register_wrap
+class AvatarToolkitQuickAccessPanel(Panel):
-class AvatarToolkitQuickAccessPanel(bpy.types.Panel):
     bl_label = t("Quick_Access.label")
     bl_idname = "OBJECT_PT_avatar_toolkit_quick_access"
     bl_space_type = 'VIEW_3D'
@@ -38,6 +37,18 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel):
         row.scale_y = 1.5  
         row.operator(AvatarToolKit_OT_ImportAnyModel.bl_idname, text=t("Quick_Access.import"), icon='IMPORT')
         row.operator(AVATAR_TOOLKIT_OT_ExportMenu.bl_idname, text=t("Quick_Access.export"), icon='EXPORT')
+        
+        if get_selected_armature(context) != None:
+            if(context.mode == "POSE"):
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_StopPoseMode.bl_idname, text=t("Quick_Access.stop_pose_mode.label"), icon='POSE_HLT')
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_ApplyPoseAsRest.bl_idname, text=t("Quick_Access.apply_pose_as_rest.label"), icon='MOD_ARMATURE')
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_ApplyPoseAsShapekey.bl_idname, text=t("Quick_Access.apply_pose_as_shapekey.label"), icon='MOD_ARMATURE')
+            else:
+                row = layout.row(align=True)
+                row.operator(AvatarToolkit_OT_StartPoseMode.bl_idname, text=t("Quick_Access.start_pose_mode.label"), icon='POSE_HLT')
 
 @register_wrap
 class AVATAR_TOOLKIT_OT_ExportMenu(bpy.types.Operator):
@@ -49,7 +60,7 @@ class AVATAR_TOOLKIT_OT_ExportMenu(bpy.types.Operator):
     def poll(cls, context):
         return any(obj.type == 'MESH' for obj in context.scene.objects)
 
-    def execute(self, context: Context):
+    def execute(self, context: Context) -> set[str]:
         return {'FINISHED'}
 
     def invoke(self, context: Context, event):
@@ -69,6 +80,170 @@ class AVATAR_TOOLKIT_OT_ExportFbx(bpy.types.Operator):
     bl_description = t("Quick_Access.export_fbx.desc")
     bl_options = {'REGISTER', 'UNDO', 'INTERNAL'}
 
-    def execute(self, context):
+    def execute(self, context) -> set[str]:
         bpy.ops.export_scene.fbx('INVOKE_DEFAULT')
         return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_StartPoseMode(Operator):
+    bl_idname = 'avatar_toolkit.start_pose_mode'
+    bl_label = t("Quick_Access.start_pose_mode.label")
+    bl_description = t("Quick_Access.start_pose_mode.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode != "POSE"
+    
+    def execute(self, context: Context) -> set[str]:
+        context.view_layer.objects.active = get_selected_armature(context)
+        bpy.ops.object.mode_set(mode='OBJECT')
+        bpy.ops.object.select_all(action='DESELECT')
+        context.view_layer.objects.active = get_selected_armature(context)
+        context.view_layer.objects.active.select_set(True)
+        bpy.ops.object.mode_set(mode='POSE')
+        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_StopPoseMode(Operator):
+    bl_idname = 'avatar_toolkit.stop_pose_mode'
+    bl_label = t("Quick_Access.stop_pose_mode.label")
+    bl_description = t("Quick_Access.stop_pose_mode.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode == "POSE"
+    
+    def execute(self, context: Context) -> set[str]:
+        bpy.ops.pose.transforms_clear()
+        bpy.ops.pose.select_all(action="INVERT")
+        bpy.ops.pose.transforms_clear()
+        bpy.ops.pose.select_all(action="INVERT")
+        bpy.ops.object.mode_set(mode='OBJECT')
+        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_ApplyPoseAsShapekey(Operator):
+    bl_idname = 'avatar_toolkit.apply_pose_as_shapekey'
+    bl_label = t("Quick_Access.apply_pose_as_shapekey.label")
+    bl_description = t("Quick_Access.apply_pose_as_shapekey.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode == "POSE"
+    
+    def execute(self, context: Context):
+        bpy.ops.object.mode_set(mode="OBJECT")
+        for obj in get_all_meshes(context):
+            modifier_armature_name: str = ""
+            context.view_layer.objects.active = obj
+            bpy.ops.object.mode_set(mode="OBJECT")
+            bpy.ops.object.select_all(action="DESELECT")
+            context.view_layer.objects.active = obj
+            obj.select_set(True)
+            for modifier in obj.modifiers:
+                if modifier.type == "ARMATURE":
+                    arm_modifier: bpy.types.ArmatureModifier = modifier
+                    modifier_armature_name = arm_modifier.object.name
+            bpy.ops.object.modifier_apply_as_shapekey(modifier=modifier_armature_name,keep_modifier=True,report=True)
+        return {'FINISHED'}
+
+@register_wrap
+class AvatarToolkit_OT_ApplyPoseAsRest(Operator):
+    bl_idname = 'avatar_toolkit.apply_pose_as_rest'
+    bl_label = t("Quick_Access.apply_pose_as_rest.label")
+    bl_description = t("Quick_Access.apply_pose_as_rest.desc")
+    bl_options = {'REGISTER', 'UNDO'}
+
+    @classmethod
+    def poll(cls, context):
+        return get_selected_armature(context) != None and context.mode == "POSE"
+    
+    def execute(self, context: Context):
+        for obj in get_all_meshes(context):
+            mesh_data: Mesh = obj.data
+
+            if mesh_data.shape_keys:
+                shape_key_obj_list: list[bpy.types.Object] = []
+                modifier_armature_name: str = ""
+
+                for modifier in obj.modifiers:
+                    if modifier.type == "ARMATURE":
+                        arm_modifier: bpy.types.ArmatureModifier = modifier
+                        modifier_armature_name = arm_modifier.object.name
+                for idx,shape in enumerate(mesh_data.shape_keys.key_blocks):
+                    if idx == 0:
+                        continue
+                    context.view_layer.objects.active = obj
+                    
+                    bpy.ops.object.mode_set(mode="OBJECT")
+                    bpy.ops.object.select_all(action="DESELECT")
+                    context.view_layer.objects.active = obj
+                    obj.select_set(True)
+
+                    bpy.ops.object.duplicate()
+
+                    shape_obj = context.view_layer.objects.active
+
+                    shape_obj.active_shape_key_index = idx
+                    shape_obj.name = shape.name
+                    
+                    bpy.ops.object.shape_key_move(type="TOP")
+
+                    bpy.ops.object.mode_set(mode="EDIT")
+                    bpy.ops.object.mode_set(mode="OBJECT")
+
+                    bpy.ops.object.shape_key_remove(all=True)
+
+                    bpy.ops.object.modifier_apply(modifier=modifier_armature_name)
+
+                    shape_key_obj_list.append(shape_obj)
+                context.view_layer.objects.active = obj
+                    
+                bpy.ops.object.mode_set(mode="OBJECT")
+                context.view_layer.objects.active.select_set(True)
+                bpy.ops.object.shape_key_remove(all=True)
+                bpy.ops.object.modifier_apply(modifier=modifier_armature_name)
+                bpy.ops.object.select_all(action="DESELECT")
+
+                for shapekey_obj in shape_key_obj_list:
+                    shapekey_obj.select_set(True)
+                context.view_layer.objects.active = obj
+                context.view_layer.objects.active.select_set(True)
+
+                try:
+                    bpy.ops.object.join_shapes()
+                except:
+                    self.report({'ERROR'}, t("Quick_Access.apply_armature_failed"))
+                    context.view_layer.objects.active = shape_key_obj_list[0]
+                    obj.select_set(False)
+                    bpy.ops.object.delete(confirm=False)
+                    return {'CANCELLED'}
+                context.view_layer.objects.active = shape_key_obj_list[0]
+                obj.select_set(False)
+                bpy.ops.object.delete(confirm=False)
+            else:
+                modifier_armature_name: str = ""
+
+                for modifier in obj.modifiers:
+                    if modifier.type == "ARMATURE":
+                        arm_modifier: bpy.types.ArmatureModifier = modifier
+                        modifier_armature_name = arm_modifier.object.name
+                context.view_layer.objects.active = obj
+                bpy.ops.object.mode_set(mode="OBJECT")
+                bpy.ops.object.select_all(action="DESELECT")
+                context.view_layer.objects.active.select_set(True)
+                bpy.ops.object.modifier_apply(modifier=modifier_armature_name)
+
+            armature_obj: bpy.types.Object = get_selected_armature(context)
+            
+            context.view_layer.objects.active = armature_obj
+            armature_obj.select_set(True)
+            bpy.ops.object.mode_set(mode="OBJECT")
+            bpy.ops.object.mode_set(mode="POSE")
+
+            bpy.ops.pose.armature_apply(selected=False)
+
+        return {'FINISHED'}