snipeslow/Avatar-Toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into Import-Anything

Browse Source
This commit is contained in:
Yusarina
2024-07-25 00:48:27 +01:00
committed by GitHub
parent 65ddea16e8 225c5f7a42
commit c27ea638a1
9 changed files with 141 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/combine_materials.py
+27 -23
View File
@@ -1,8 +1,8 @@
import bpy
import re
from typing import List, Tuple, Optional
from typing import List, Tuple, Optional, Set
from bpy.types import Material, Operator, Context, Object
from ..core.common import clean_material_names
from ..core.common import clean_material_names, get_selected_armature, is_valid_armature, get_all_meshes
from ..core.register import register_wrap
from ..functions.translations import t
@@ -65,49 +65,54 @@ class CombineMaterials(Operator):
@classmethod
def poll(cls, context: Context) -> bool:
return context.active_object is not None
armature = get_selected_armature(context)
return armature is not None and is_valid_armature(armature)
def execute(self, context: Context) -> set:
bpy.ops.object.mode_set(mode='OBJECT')
armature: Optional[Object] = next((obj for obj in bpy.data.objects if obj.type == 'ARMATURE'), None)
def execute(self, context: Context) -> Set[str]:
armature = get_selected_armature(context)
if not armature:
self.report({'WARNING'}, "No armature selected")
return {'CANCELLED'}
meshes: List[Object] = [obj for obj in bpy.data.objects if obj.type == 'MESH' and 'Armature' in obj.modifiers and obj.modifiers['Armature'].object == armature]
if not meshes:
return {'CANCELLED'}
context.view_layer.objects.active = armature
bpy.ops.object.mode_set(mode='OBJECT')
meshes = get_all_meshes(context)
if not meshes:
self.report({'WARNING'}, "No meshes found for the selected armature")
return {'CANCELLED'}
self.consolidate_materials(meshes)
self.remove_unused_materials()
self.cleanmatslots()
self.clean_material_names()
bpy.ops.object.mode_set(mode='OBJECT')
bpy.context.view_layer.objects.active = armature
return {'FINISHED'}
def consolidate_materials(self, objects: List[Object]) -> None:
mat_mapping: dict = {}
def consolidate_materials(self, meshes: List[Object]) -> None:
mat_mapping: Dict[str, Material] = {}
num_combined: int = 0
for ob in objects:
for slot in ob.material_slots:
for mesh in meshes:
for slot in mesh.material_slots:
mat: Optional[Material] = slot.material
if mat:
base_name: str = get_base_name(mat.name)
if base_name in mat_mapping:
base_mat: Material = mat_mapping[base_name]
if materials_match(base_mat, mat):
consolidate_textures(base_mat, mat)
num_combined += 1
slot.material = base_mat
try:
if materials_match(base_mat, mat):
consolidate_textures(base_mat, mat)
num_combined += 1
slot.material = base_mat
except AttributeError:
# Skip this material if there's an attribute mismatch
continue
else:
mat_mapping[base_name] = mat
report_consolidated(self, num_combined)
def remove_unused_materials(self) -> None:
for mat in bpy.data.materials:
if not any(obj for obj in bpy.data.objects if obj.material_slots and mat.name in obj.material_slots):
@@ -125,4 +130,3 @@ class CombineMaterials(Operator):
for obj in bpy.data.objects:
if obj.type == 'MESH':
clean_material_names(obj)
functions/join_meshes.py
+15 -11
View File
@@ -1,8 +1,8 @@
import bpy
from typing import List, Optional
from typing import List, Optional, Set
from bpy.types import Operator, Context, Object
from ..core.register import register_wrap
from ..core.common import fix_uv_coordinates
from ..core.common import fix_uv_coordinates, get_selected_armature, is_valid_armature, select_current_armature, get_all_meshes
from ..functions.translations import t
@register_wrap
@@ -14,21 +14,23 @@ class JoinAllMeshes(Operator):
@classmethod
def poll(cls, context: Context) -> bool:
return context.mode == 'OBJECT'
armature = get_selected_armature(context)
return armature is not None and is_valid_armature(armature)
def execute(self, context: Context) -> set:
def execute(self, context: Context) -> Set[str]:
self.join_all_meshes(context)
return {'FINISHED'}
def join_all_meshes(self, context: Context) -> None:
if not bpy.data.objects:
self.report({'INFO'}, "No objects in the scene")
if not select_current_armature(context):
self.report({'WARNING'}, "No armature selected")
return
armature = get_selected_armature(context)
bpy.ops.object.mode_set(mode='OBJECT')
bpy.ops.object.select_all(action='DESELECT')
meshes: List[Object] = [obj for obj in bpy.data.objects if obj.type == 'MESH']
meshes: List[Object] = get_all_meshes(context)
for mesh in meshes:
mesh.select_set(True)
@@ -43,6 +45,8 @@ class JoinAllMeshes(Operator):
else:
self.report({'WARNING'}, "No mesh objects selected")
context.view_layer.objects.active = armature
@register_wrap
class JoinSelectedMeshes(Operator):
bl_idname = "avatar_toolkit.join_selected_meshes"
@@ -52,17 +56,17 @@ class JoinSelectedMeshes(Operator):
@classmethod
def poll(cls, context: Context) -> bool:
return context.mode == 'OBJECT'
return context.mode == 'OBJECT' and len([obj for obj in context.selected_objects if obj.type == 'MESH']) > 1
def execute(self, context: Context) -> set:
def execute(self, context: Context) -> Set[str]:
self.join_selected_meshes(context)
return {'FINISHED'}
def join_selected_meshes(self, context: Context) -> None:
selected_objects: List[Object] = [obj for obj in bpy.context.selected_objects if obj.type == 'MESH']
if not selected_objects:
self.report({'WARNING'}, "No mesh objects selected")
if len(selected_objects) < 2:
self.report({'WARNING'}, "Please select at least two mesh objects")
return
bpy.ops.object.mode_set(mode='OBJECT')
functions/remove_doubles_safely.py
+9 -27
View File
@@ -5,7 +5,7 @@ import re
from typing import List, Tuple, Optional, TypedDict
from bpy.types import Material, Operator, Context, Object
from ..core.register import register_wrap
from ..core.common import get_armature
from ..core.common import get_selected_armature, is_valid_armature, select_current_armature, get_all_meshes
class meshEntry(TypedDict):
@@ -23,20 +23,20 @@ class RemoveDoublesSafely(Operator):
@classmethod
def poll(cls, context: Context) -> bool:
return context.mode == 'OBJECT'
armature = get_selected_armature(context)
return armature is not None and is_valid_armature(armature)
def execute(self, context: Context) -> set:
if not bpy.data.objects:
self.report({'INFO'}, "No objects in the scene")
return
if not select_current_armature(context):
self.report({'WARNING'}, "No armature selected")
return {'CANCELLED'}
armature = get_selected_armature(context)
bpy.ops.object.mode_set(mode='OBJECT')
bpy.ops.object.select_all(action='DESELECT')
objects: List[Object] = get_armature(context).children if get_armature(context) else context.view_layer.objects
objects: List[Object] = get_all_meshes(context)
meshes: List[Object] = [obj for obj in objects if obj.type == 'MESH']
for mesh in meshes:
for mesh in objects:
if mesh.data.name not in [stored_object["mesh"].data.name for stored_object in self.objects_to_do]:
mesh_shapekeys = {"mesh":mesh,"shapekeys":[]}
mesh_data: bpy.types.Mesh = mesh.data
@@ -45,12 +45,10 @@ class RemoveDoublesSafely(Operator):
for shape in mesh_data.shape_keys.key_blocks:
mesh_shapekeys["shapekeys"].append(shape.name)
self.objects_to_do.append(mesh_shapekeys)
return {'FINISHED'}
def invoke(self, context: Context, event: bpy.types.Event) -> set:
self.execute(context)
context.window_manager.modal_handler_add(self)
return {'RUNNING_MODAL'}
@@ -62,7 +60,6 @@ class RemoveDoublesSafely(Operator):
mesh_data: bpy.types.Mesh = mesh["mesh"].data
bpy.ops.object.mode_set(mode='EDIT')
bpy.ops.object.mode_set(mode='OBJECT')
for index, point in enumerate(mesh["mesh"].active_shape_key.points):
if point.co.xyz != mesh_data.shape_keys.key_blocks[0].points[index].co.xyz:
@@ -70,18 +67,10 @@ class RemoveDoublesSafely(Operator):
print("shapekey has a moved vertex at index \""+str(index)+"\", excluding from double merging!")
bpy.ops.object.mode_set(mode='EDIT')
bpy.ops.object.mode_set(mode='OBJECT')
mesh["mesh"].select_set(False)
def modal(self, context: Context, event: bpy.types.Event) -> set:
if len(self.objects_to_do) > 0:
mesh = self.objects_to_do[0]
mesh_data: bpy.types.Mesh = mesh["mesh"].data
@@ -131,10 +120,3 @@ class RemoveDoublesSafely(Operator):
return {'FINISHED'}
return {'RUNNING_MODAL'}
functions/resonite_functions.py
+8 -9
View File
@@ -4,7 +4,7 @@ from typing import List, Optional
import re
from bpy.types import Operator, Context, Object
from ..core.dictionaries import bone_names
from ..core.common import get_armature, simplify_bonename
from ..core.common import get_selected_armature, simplify_bonename, is_valid_armature
from ..functions.translations import t
@register_wrap
@@ -16,12 +16,14 @@ class ConvertToResonite(Operator):
@classmethod
def poll(cls, context: Context) -> bool:
if not get_armature(context):
return False
return True
armature = get_selected_armature(context)
return armature is not None and is_valid_armature(armature)
def execute(self, context: Context) -> set:
armature = get_armature(context)
armature = get_selected_armature(context)
if not armature:
self.report({'WARNING'}, "No armature selected")
return {'CANCELLED'}
translate_bone_fails = 0
untranslated_bones = set()
@@ -89,8 +91,6 @@ class ConvertToResonite(Operator):
'thumb_3_r': "thumb3.R"
}
context.view_layer.objects.active = armature
bpy.ops.object.mode_set(mode='EDIT')
@@ -111,5 +111,4 @@ class ConvertToResonite(Operator):
else:
self.report({'INFO'}, "Successfully translated all bones to humanoid names")
return {'FINISHED'}
return {'FINISHED'}