Added a modal for remove doubles
- made remove doubles a blender modal. this way the code can run over multiple frames. - Since remove doubles is async now, the user gets feedback on which shapekey and mesh is being worked on - this does not remove doubles correctly yet, but is very close to ready
This commit is contained in:
@@ -1,2 +1,3 @@
|
|||||||
|
|
||||||
*.pyc
|
*.pyc
|
||||||
|
.vscode/settings.json
|
||||||
|
|||||||
Vendored
+11
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"python.analysis.extraPaths": [
|
||||||
|
"D:\\SteamLibrary\\steamapps\\common\\Blender\\4.0\\scripts\\addons",
|
||||||
|
"C:\\Users\\Onan\\AppData\\Roaming\\Blender Foundation\\Blender\\4.0\\scripts\\addons",//C:/Users/Onan/AppData/Roaming/Blender Foundation/Blender/4.0/scripts/addons
|
||||||
|
"D:\\blender stuff\\blendercodestuff\\4.0"
|
||||||
|
],
|
||||||
|
"python.analysis.diagnosticSeverityOverrides": {
|
||||||
|
"reportInvalidTypeForm": "none"
|
||||||
|
},
|
||||||
|
"python.REPL.enableREPLSmartSend": false,
|
||||||
|
}
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
from ast import Dict
|
||||||
|
from itertools import count
|
||||||
|
import bpy
|
||||||
|
import re
|
||||||
|
from typing import List, Tuple, Optional, TypedDict
|
||||||
|
from bpy.types import Material, Operator, Context, Object
|
||||||
|
from ..core.register import register_wrap
|
||||||
|
|
||||||
|
|
||||||
|
class meshEntry(TypedDict):
|
||||||
|
mesh: bpy.types.Object
|
||||||
|
shapekeys: list[str]
|
||||||
|
|
||||||
|
@register_wrap
|
||||||
|
class RemoveDoublesSafely(Operator):
|
||||||
|
bl_idname = "avatar_toolkit.remove_doubles_safely"
|
||||||
|
bl_label = "Remove Doubles Safely"
|
||||||
|
bl_description = "Remove Doubles on all meshes, making sure to not fuse things like mouths together."
|
||||||
|
bl_options = {'REGISTER', 'UNDO'}
|
||||||
|
objects_to_do: list[meshEntry] = []
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def poll(cls, context: Context) -> bool:
|
||||||
|
return context.mode == 'OBJECT'
|
||||||
|
|
||||||
|
def execute(self, context: Context) -> set:
|
||||||
|
if not bpy.data.objects:
|
||||||
|
self.report({'INFO'}, "No objects in the scene")
|
||||||
|
return
|
||||||
|
|
||||||
|
bpy.ops.object.mode_set(mode='OBJECT')
|
||||||
|
bpy.ops.object.select_all(action='DESELECT')
|
||||||
|
|
||||||
|
meshes: List[Object] = [obj for obj in context.view_layer.objects if obj.type == 'MESH']
|
||||||
|
|
||||||
|
for mesh in meshes:
|
||||||
|
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
|
||||||
|
shape: bpy.types.ShapeKey = None
|
||||||
|
if mesh_data.shape_keys:
|
||||||
|
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'}
|
||||||
|
|
||||||
|
def modify_mesh(self, context: Context, mesh: meshEntry):
|
||||||
|
mesh["mesh"].select_set(True)
|
||||||
|
context.view_layer.objects.active = mesh["mesh"]
|
||||||
|
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
|
||||||
|
if len(mesh['shapekeys']) > 0:
|
||||||
|
shapekeyname: str = mesh['shapekeys'].pop(0)
|
||||||
|
|
||||||
|
target_shapekey: int = mesh_data.shape_keys.key_blocks.find(shapekeyname)
|
||||||
|
mesh["mesh"].active_shape_key_index = target_shapekey
|
||||||
|
print("doing shapekey \""+shapekeyname+"\" on mesh \""+mesh['mesh'].name+"\".")
|
||||||
|
self.modify_mesh(context, mesh)
|
||||||
|
|
||||||
|
elif not (mesh_data.shape_keys):
|
||||||
|
print("doing mesh with no shapekeys named \""+mesh['mesh'].name+"\".")
|
||||||
|
self.modify_mesh(context, mesh)
|
||||||
|
self.objects_to_do.pop(0)
|
||||||
|
else:
|
||||||
|
self.objects_to_do.pop(0)
|
||||||
|
else:
|
||||||
|
return {'FINISHED'}
|
||||||
|
|
||||||
|
return {'RUNNING_MODAL'}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -25,6 +25,7 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel):
|
|||||||
row.scale_y = 1.2
|
row.scale_y = 1.2
|
||||||
row.operator("avatar_toolkit.join_all_meshes", text="Join All Meshes")
|
row.operator("avatar_toolkit.join_all_meshes", text="Join All Meshes")
|
||||||
row.operator("avatar_toolkit.join_selected_meshes", text="Join Selected Meshes")
|
row.operator("avatar_toolkit.join_selected_meshes", text="Join Selected Meshes")
|
||||||
|
row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely")
|
||||||
|
|
||||||
# Add optimization options here
|
# Add optimization options here
|
||||||
|
|
||||||
|
|||||||
@@ -20,3 +20,5 @@ class AvatarToolkitToolsPanel(bpy.types.Panel):
|
|||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
row.scale_y = 1.5
|
row.scale_y = 1.5
|
||||||
row.operator("avatar_toolkit.convert_to_resonite", text="Translate to Resonite")
|
row.operator("avatar_toolkit.convert_to_resonite", text="Translate to Resonite")
|
||||||
|
row = layout.row(align=True)
|
||||||
|
row.operator("avatar_toolkit.remove_doubles_safely", text="Remove Doubles Safely")
|
||||||
Reference in New Issue
Block a user