diff --git a/core/import_dictionary.py b/core/import_dictionary.py deleted file mode 100644 index 023038f..0000000 --- a/core/import_dictionary.py +++ /dev/null @@ -1,45 +0,0 @@ -import importlib.util -import bpy -import os -import typing - -if importlib.util.find_spec("io_scene_valvesource") is not None: - #from .....scripts.addons.io_scene_valvesource.import_smd import SmdImporter #<- use this to check if your IDE is working properly. idfk - from io_scene_valvesource.import_smd import SmdImporter #ignore IDE bitching this is fine, trust me, also above comment should be okay to an IDE usually if set up right. ^_^ - @989onan - -def import_multi_files(method = None, directory: typing.Optional[str] = None, files: list[dict[str,str]] = None, filepath: typing.Optional[str] = ""): - if not files: - method(directory, filepath) - else: - for file in files: - fullpath = os.path.join(directory,os.path.basename(file["name"])) - print("run method!") - method(directory, fullpath) -#each import should map to a type. even in the case that multiple methods should import together, or have the same import method. Make sure the lambdas match so they get grouped together -#In the case of a file importer that takes only one file argument and each one needs individual import, use above method. (example of it in use is ".dae" format) -import_types: dict[str, typing.Callable[[str, list[dict[str,str]], str], None]] = { - "fbx": (lambda directory, files, filepath : bpy.ops.import_scene.fbx(files=files, directory=directory, filepath=filepath,automatic_bone_orientation=False,use_prepost_rot=False,use_anim=False)), - "smd": (lambda directory, files, filepath : eval("bpy."+SmdImporter.bl_idname+".(files=files, directory=directory, filepath=filepath)")), - "dmx": (lambda directory, files, filepath: eval("bpy."+SmdImporter.bl_idname+".(files=files, directory=directory, filepath=filepath)")), - "gltf": (lambda directory, files, filepath : bpy.ops.import_scene.gltf(files=files, filepath=filepath)), - "glb": (lambda directory, files, filepath : bpy.ops.import_scene.gltf(files=files, filepath=filepath)), - "qc": (lambda directory, files, filepath : eval("bpy."+SmdImporter.bl_idname+".(files=files, directory=directory, filepath=filepath)")), - "obj": (lambda directory, files, filepath : bpy.ops.wm.obj_import(files=files, directory=directory, filepath=filepath)), - "dae": (lambda directory, files, filepath : import_multi_files(directory=directory, files=files, filepath=filepath, method = (lambda directory, filepath: bpy.ops.wm.collada_import(filepath=filepath, auto_connect = True, find_chains = True, fix_orientation = True)))), - "3ds": (lambda directory, files, filepath : bpy.ops.import_scene.max3ds(files=files, directory=directory, filepath=filepath)), - "stl": (lambda directory, files, filepath : bpy.ops.import_mesh.stl(files=files, directory=directory, filepath=filepath)), - "mtl": (lambda directory, files, filepath : bpy.ops.wm.obj_import(files=files, directory=directory, filepath=filepath)), - "x3d": (lambda directory, files, filepath : bpy.ops.import_scene.x3d(files=files, directory=directory, filepath=filepath)), - "wrl": (lambda directory, files, filepath : bpy.ops.import_scene.x3d(files=files, directory=directory, filepath=filepath)), - "vmd": (lambda directory, files, filepath : import_multi_files(directory=directory, files=files, filepath=filepath, method = (lambda directory, filepath: bpy.ops.tuxedo.import_mmd_animation(directory=directory, filepath=filepath)))), - "pmx": (lambda directory, files, filepath : bpy.ops.mmd_tools.import_model(files=files, directory=directory, filepath=filepath)), - "pmd": (lambda directory, files, filepath : bpy.ops.mmd_tools.import_model(files=files, directory=directory, filepath=filepath)), -} - -def concat_imports_filter(imports): - names = "" - for importer in imports.keys(): - names = names+"*."+importer+";" - return names - -imports = concat_imports_filter(import_types) \ No newline at end of file diff --git a/core/importer.py b/core/importer.py index e29ca11..9e86387 100644 --- a/core/importer.py +++ b/core/importer.py @@ -1,17 +1,53 @@ import bpy # Importers which don't need much code should be added here, however if a importer needs alot of code -# Like the PMX and PMD importers, they should be added to their own files. +# Like the PMX and PMD importers, they should be added to their own files and referenced in the import_types str->lambda dictionary. +#See below comments on how the system works. - @989onan -# FBX Importer settings borrowed form Cat's Blender Plugin -def import_fbx(filepath): - try: - bpy.ops.import_scene.fbx( - filepath=filepath, - automatic_bone_orientation=False, - use_prepost_rot=False, - use_anim=False - ) - except (TypeError, ValueError) as e: - print(f"Error importing FBX: {str(e)}") +import importlib.util +import os +import typing +from .import_pmx import import_pmx +from .import_pmd import import_pmd + +if importlib.util.find_spec("io_scene_valvesource") is not None: + #from .....scripts.addons.io_scene_valvesource.import_smd import SmdImporter #<- use this to check if your IDE is working properly. idfk + from io_scene_valvesource.import_smd import SmdImporter #ignore IDE bitching this is fine, trust me, also above comment should be okay to an IDE usually if set up right. ^_^ - @989onan + +def import_multi_files(method = None, directory: typing.Optional[str] = None, files: list[dict[str,str]] = None, filepath: typing.Optional[str] = ""): + if not files: + method(directory, filepath) + else: + for file in files: + fullpath = os.path.join(directory,os.path.basename(file["name"])) + print("run method!") + method(directory, fullpath) +#each import should map to a type. even in the case that multiple methods should import together, or have the same import method. Make sure the lambdas match so they get grouped together +#In the case of a file importer that takes only one file argument and each one needs individual import, use above method. (example of it in use is ".dae" format) +import_types: dict[str, typing.Callable[[str, list[dict[str,str]], str], None]] = { + "fbx": (lambda directory, files, filepath : bpy.ops.import_scene.fbx(files=files, directory=directory, filepath=filepath,automatic_bone_orientation=False,use_prepost_rot=False,use_anim=False)), + "smd": (lambda directory, files, filepath : eval("bpy."+SmdImporter.bl_idname+".(files=files, directory=directory, filepath=filepath)")), + "dmx": (lambda directory, files, filepath: eval("bpy."+SmdImporter.bl_idname+".(files=files, directory=directory, filepath=filepath)")), + "gltf": (lambda directory, files, filepath : bpy.ops.import_scene.gltf(files=files, filepath=filepath)), + "glb": (lambda directory, files, filepath : bpy.ops.import_scene.gltf(files=files, filepath=filepath)), + "qc": (lambda directory, files, filepath : eval("bpy."+SmdImporter.bl_idname+".(files=files, directory=directory, filepath=filepath)")), + "obj": (lambda directory, files, filepath : bpy.ops.wm.obj_import(files=files, directory=directory, filepath=filepath)), + "dae": (lambda directory, files, filepath : import_multi_files(directory=directory, files=files, filepath=filepath, method = (lambda directory, filepath: bpy.ops.wm.collada_import(filepath=filepath, auto_connect = True, find_chains = True, fix_orientation = True)))), + "3ds": (lambda directory, files, filepath : bpy.ops.import_scene.max3ds(files=files, directory=directory, filepath=filepath)), + "stl": (lambda directory, files, filepath : bpy.ops.import_mesh.stl(files=files, directory=directory, filepath=filepath)), + "mtl": (lambda directory, files, filepath : bpy.ops.wm.obj_import(files=files, directory=directory, filepath=filepath)), + "x3d": (lambda directory, files, filepath : bpy.ops.import_scene.x3d(files=files, directory=directory, filepath=filepath)), + "wrl": (lambda directory, files, filepath : bpy.ops.import_scene.x3d(files=files, directory=directory, filepath=filepath)), + "vmd": (lambda directory, files, filepath : import_multi_files(directory=directory, files=files, filepath=filepath, method = (lambda directory, filepath: bpy.ops.tuxedo.import_mmd_animation(directory=directory, filepath=filepath)))), + "pmx": (lambda directory, files, filepath : import_pmx(filepath)), + "pmd": (lambda directory, files, filepath : import_pmd(filepath)), +} + +def concat_imports_filter(imports): + names = "" + for importer in imports.keys(): + names = names+"*."+importer+";" + return names + +imports = concat_imports_filter(import_types) \ No newline at end of file diff --git a/core/preferences.json b/core/preferences.json new file mode 100644 index 0000000..b0ca7bf --- /dev/null +++ b/core/preferences.json @@ -0,0 +1,3 @@ +{ + "language": 0 +} \ No newline at end of file diff --git a/functions/import_anything.py b/functions/import_anything.py index 4b8bcbf..f4a5921 100644 --- a/functions/import_anything.py +++ b/functions/import_anything.py @@ -1,12 +1,12 @@ import bpy -from bpy.types import Operator, ImportHelper +from bpy.types import Operator +from bpy_extras.io_utils import ImportHelper from ..core.register import register_wrap -from ..core.import_dictionary import imports, import_types +from ..core.importer import imports, import_types from ..functions.translations import t import pathlib import os from ..core import common -from ..core.dictionaries import bone_names @register_wrap class ImportAnyModel(Operator, ImportHelper): diff --git a/ui/quick_access.py b/ui/quick_access.py index 81b9bee..802af88 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -6,7 +6,7 @@ from ..functions.translations import t from ..core.import_pmx import import_pmx from ..core.import_pmd import import_pmd -from ..core.importer import import_fbx +from ..functions.import_anything import ImportAnyModel @register_wrap class AvatarToolkitQuickAccessPanel(bpy.types.Panel): @@ -28,29 +28,9 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel): row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.import_menu", text=t("Quick_Access.import")) + row.operator(ImportAnyModel.bl_idname, text=t("Quick_Access.import")) row.operator("avatar_toolkit.export_menu", text=t("Quick_Access.export")) -@register_wrap -class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): - bl_idname = "avatar_toolkit.import_menu" - bl_label = t("Quick_Access.import_menu.label") - bl_description = t("Quick_Access.import_menu.desc") - - def execute(self, context: Context): - return {'FINISHED'} - - def invoke(self, context: Context, event): - wm = context.window_manager - return wm.invoke_popup(self, width=200) - - def draw(self, context: Context): - layout = self.layout - layout.label(text="Select Import Method") - layout.operator("avatar_toolkit.import_pmx", text=t("Quick_Access.import_pmx")) - layout.operator("avatar_toolkit.import_pmd", text=t("Quick_Access.import_pmd")) - layout.operator("avatar_toolkit.import_fbx", text="Import FBX") - @register_wrap class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.export_menu" @@ -74,51 +54,6 @@ class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): layout.operator("avatar_toolkit.export_resonite", text=t("Quick_Access.select_export_resonite.label")) layout.operator("avatar_toolkit.export_fbx", text="Export FBX") -@register_wrap -class AVATAR_TOOLKIT_OT_import_pmx(bpy.types.Operator): - bl_idname = "avatar_toolkit.import_pmx" - bl_label = t("Quick_Access.import_pmx") - - filepath: bpy.props.StringProperty(subtype="FILE_PATH") - - def execute(self, context: Context): - import_pmx(self.filepath) - return {'FINISHED'} - - def invoke(self, context: Context, event): - context.window_manager.fileselect_add(self) - return {'RUNNING_MODAL'} - -@register_wrap -class AVATAR_TOOLKIT_OT_import_pmd(bpy.types.Operator): - bl_idname = "avatar_toolkit.import_pmd" - bl_label = t("Quick_Access.import_pmd") - - filepath: bpy.props.StringProperty(subtype="FILE_PATH") - - def execute(self, context: Context): - import_pmd(self.filepath) - return {'FINISHED'} - - def invoke(self, context: Context, event): - context.window_manager.fileselect_add(self) - return {'RUNNING_MODAL'} - -@register_wrap -class AVATAR_TOOLKIT_OT_import_fbx(bpy.types.Operator): - bl_idname = "avatar_toolkit.import_fbx" - bl_label = "Import FBX" - - filepath: bpy.props.StringProperty(subtype="FILE_PATH") - - def execute(self, context): - import_fbx(self.filepath) - return {'FINISHED'} - - def invoke(self, context, event): - context.window_manager.fileselect_add(self) - return {'RUNNING_MODAL'} - @register_wrap class AVATAR_TOOLKIT_OT_export_fbx(bpy.types.Operator): bl_idname = 'avatar_toolkit.export_fbx'