From 90c5aa70c4d720570ea032e3571c5993da9f2471 Mon Sep 17 00:00:00 2001 From: Yusarina Date: Sat, 27 Jul 2024 21:56:16 +0100 Subject: [PATCH 1/2] More Tools - Added Apply Transforms - Added Separate by materials and loose parts. --- functions/additional_tools.py | 37 +++++++++++++++++++++++++ functions/seperate_by.py | 45 +++++++++++++++++++++++++++++++ resources/translations/en_US.json | 10 +++++++ resources/translations/ja_JP.json | 10 +++++++ ui/tools.py | 9 +++++++ 5 files changed, 111 insertions(+) create mode 100644 functions/additional_tools.py create mode 100644 functions/seperate_by.py diff --git a/functions/additional_tools.py b/functions/additional_tools.py new file mode 100644 index 0000000..e5cb05a --- /dev/null +++ b/functions/additional_tools.py @@ -0,0 +1,37 @@ +import bpy +from bpy.types import Context, Operator +from ..core.register import register_wrap +from ..core.common import get_selected_armature, is_valid_armature, get_all_meshes +from ..functions.translations import t + +@register_wrap +class ApplyTransforms(Operator): + bl_idname = "avatar_toolkit.apply_transforms" + bl_label = t("Tools.apply_transforms.label") + bl_description = t("Tools.apply_transforms.desc") + bl_options = {'REGISTER', 'UNDO'} + + @classmethod + def poll(cls, context: Context) -> bool: + return get_selected_armature(context) is not None + + def execute(self, context: Context) -> set[str]: + armature = get_selected_armature(context) + if not is_valid_armature(armature): + self.report({'ERROR'}, t("Tools.apply_transforms.invalid_armature")) + return {'CANCELLED'} + + bpy.ops.object.mode_set(mode='OBJECT') + bpy.ops.object.select_all(action='DESELECT') + + armature.select_set(True) + context.view_layer.objects.active = armature + + meshes = get_all_meshes(context) + for mesh in meshes: + mesh.select_set(True) + + bpy.ops.object.transform_apply(location=True, rotation=True, scale=True) + + self.report({'INFO'}, t("Tools.apply_transforms.success")) + return {'FINISHED'} diff --git a/functions/seperate_by.py b/functions/seperate_by.py new file mode 100644 index 0000000..52e507a --- /dev/null +++ b/functions/seperate_by.py @@ -0,0 +1,45 @@ +import bpy +from bpy.types import Context, Operator +from ..core.register import register_wrap +from ..core.common import get_selected_armature, is_valid_armature, select_current_armature +from ..functions.translations import t + +@register_wrap +class SeparateByMaterials(Operator): + bl_idname = "avatar_toolkit.separate_by_materials" + bl_label = t("Tools.separate_by_materials.label") + bl_description = t("Tools.separate_by_materials.desc") + bl_options = {'REGISTER', 'UNDO'} + + @classmethod + def poll(cls, context: Context) -> bool: + return context.active_object and context.active_object.type == 'MESH' + + def execute(self, context: Context) -> set[str]: + obj = context.active_object + bpy.ops.object.mode_set(mode='EDIT') + bpy.ops.mesh.select_all(action='SELECT') + bpy.ops.mesh.separate(type='MATERIAL') + bpy.ops.object.mode_set(mode='OBJECT') + self.report({'INFO'}, t("Tools.separate_by_materials.success")) + return {'FINISHED'} + +@register_wrap +class SeparateByLooseParts(Operator): + bl_idname = "avatar_toolkit.separate_by_loose_parts" + bl_label = t("Tools.separate_by_loose_parts.label") + bl_description = t("Tools.separate_by_loose_parts.desc") + bl_options = {'REGISTER', 'UNDO'} + + @classmethod + def poll(cls, context: Context) -> bool: + return context.active_object and context.active_object.type == 'MESH' + + def execute(self, context: Context) -> set[str]: + obj = context.active_object + bpy.ops.object.mode_set(mode='EDIT') + bpy.ops.mesh.select_all(action='SELECT') + bpy.ops.mesh.separate(type='LOOSE') + bpy.ops.object.mode_set(mode='OBJECT') + self.report({'INFO'}, t("Tools.separate_by_loose_parts.success")) + return {'FINISHED'} diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index 368396b..7d22395 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -108,6 +108,16 @@ "Tools.no_armature_selected": "No armature selected", "Tools.select_armature": "Please select an armature", "Tools.tools_title.label": "Tools:", + "Tools.separate_by_materials.label": "Separate by Materials", + "Tools.separate_by_materials.desc": "Separate the selected mesh by materials", + "Tools.separate_by_materials.success": "Mesh separated by materials successfully", + "Tools.separate_by_loose_parts.label": "Separate by Loose Parts", + "Tools.separate_by_loose_parts.desc": "Separate the selected mesh by loose parts", + "Tools.separate_by_loose_parts.success": "Mesh separated by loose parts successfully", + "Tools.apply_transforms.label": "Apply Transforms", + "Tools.apply_transforms.desc": "Apply position, rotation, and scale to the armature and its meshes", + "Tools.apply_transforms.invalid_armature": "Invalid armature selected", + "Tools.apply_transforms.success": "Transforms applied successfully to armature and meshes", "VisemePanel.create_visemes": "Create Visemes", "VisemePanel.creating_viseme": "Creating viseme: {viseme_name}", "VisemePanel.creating_viseme_detail": "Creating viseme: {viseme_name}", diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index ef93193..36589c1 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -108,6 +108,16 @@ "Tools.no_armature_selected": "アーマチュアが選択されていません", "Tools.select_armature": "アーマチュアを選択してください", "Tools.tools_title.label": "ツール：", + "Tools.separate_by_materials.label": "マテリアルで分離", + "Tools.separate_by_materials.desc": "選択されたメッシュをマテリアルごとに分離します", + "Tools.separate_by_materials.success": "メッシュがマテリアルごとに正常に分離されました", + "Tools.separate_by_loose_parts.label": "バラバラの部分で分離", + "Tools.separate_by_loose_parts.desc": "選択されたメッシュをバラバラの部分ごとに分離します", + "Tools.separate_by_loose_parts.success": "メッシュがバラバラの部分ごとに正常に分離されました", + "Tools.apply_transforms.label": "トランスフォームを適用", + "Tools.apply_transforms.desc": "アーマチュアとそのメッシュに位置、回転、スケールを適用します", + "Tools.apply_transforms.invalid_armature": "無効なアーマチュアが選択されています", + "Tools.apply_transforms.success": "アーマチュアとメッシュにトランスフォームが正常に適用されました", "VisemePanel.create_visemes": "ビセームを作成", "VisemePanel.creating_viseme": "ビセームを作成中：{viseme_name}", "VisemePanel.creating_viseme_detail": "ビセームを作成中：{viseme_name}", diff --git a/ui/tools.py b/ui/tools.py index 78dfbe1..5d02b86 100644 --- a/ui/tools.py +++ b/ui/tools.py @@ -5,6 +5,8 @@ from bpy.types import Context from ..functions.digitigrade_legs import CreateDigitigradeLegs from ..functions.translations import t from ..core.common import get_selected_armature +from ..functions.seperate_by import SeparateByMaterials, SeparateByLooseParts +from ..functions.additional_tools import ApplyTransforms @register_wrap class AvatarToolkitToolsPanel(bpy.types.Panel): @@ -29,5 +31,12 @@ class AvatarToolkitToolsPanel(bpy.types.Panel): row.operator("avatar_toolkit.convert_to_resonite", text=t("Tools.convert_to_resonite.label"), icon='SCENE_DATA') row = layout.row(align=True) row.operator(CreateDigitigradeLegs.bl_idname, text=t("Tools.create_digitigrade_legs.label"), icon='BONE_DATA') + layout.separator() + row = layout.row(align=True) + row.operator(SeparateByMaterials.bl_idname, text=t("Tools.separate_by_materials.label"), icon='MATERIAL') + row = layout.row(align=True) + row.operator(SeparateByLooseParts.bl_idname, text=t("Tools.separate_by_loose_parts.label"), icon='OUTLINER_OB_MESH') + row = layout.row(align=True) + row.operator(ApplyTransforms.bl_idname, text=t("Tools.apply_transforms.label"), icon='OBJECT_ORIGIN') else: layout.label(text=t("Tools.select_armature"), icon='ERROR') From 8a6535044cf59e5e8650c05fb4d4e3be7c950e12 Mon Sep 17 00:00:00 2001 From: Yusarina Date: Sat, 27 Jul 2024 21:59:31 +0100 Subject: [PATCH 2/2] UI Update --- resources/translations/en_US.json | 1 + resources/translations/ja_JP.json | 1 + ui/tools.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index 7d22395..a44cd82 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -108,6 +108,7 @@ "Tools.no_armature_selected": "No armature selected", "Tools.select_armature": "Please select an armature", "Tools.tools_title.label": "Tools:", + "Tools.separate_by.label": "Separate By:", "Tools.separate_by_materials.label": "Separate by Materials", "Tools.separate_by_materials.desc": "Separate the selected mesh by materials", "Tools.separate_by_materials.success": "Mesh separated by materials successfully", diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 36589c1..f091290 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -108,6 +108,7 @@ "Tools.no_armature_selected": "アーマチュアが選択されていません", "Tools.select_armature": "アーマチュアを選択してください", "Tools.tools_title.label": "ツール：", + "Tools.separate_by.label": "別:", "Tools.separate_by_materials.label": "マテリアルで分離", "Tools.separate_by_materials.desc": "選択されたメッシュをマテリアルごとに分離します", "Tools.separate_by_materials.success": "メッシュがマテリアルごとに正常に分離されました", diff --git a/ui/tools.py b/ui/tools.py index 5d02b86..7d8dc73 100644 --- a/ui/tools.py +++ b/ui/tools.py @@ -33,8 +33,8 @@ class AvatarToolkitToolsPanel(bpy.types.Panel): row.operator(CreateDigitigradeLegs.bl_idname, text=t("Tools.create_digitigrade_legs.label"), icon='BONE_DATA') layout.separator() row = layout.row(align=True) + layout.label(text=t("Tools.separate_by.label"), icon='MESH') row.operator(SeparateByMaterials.bl_idname, text=t("Tools.separate_by_materials.label"), icon='MATERIAL') - row = layout.row(align=True) row.operator(SeparateByLooseParts.bl_idname, text=t("Tools.separate_by_loose_parts.label"), icon='OUTLINER_OB_MESH') row = layout.row(align=True) row.operator(ApplyTransforms.bl_idname, text=t("Tools.apply_transforms.label"), icon='OBJECT_ORIGIN')