From b7a48838a58170af18b6ad24fc5757228de1d2f6 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 19 Sep 2020 22:03:20 -0700 Subject: [PATCH] Organized addons into a folder --- sound_objects/__init__.py | 47 +++++++++++++++++++ .../operator_add_speakers_to_objects.py | 36 +++++++------- .../operator_adm_export.py | 38 +++++++-------- .../operator_wav_import.py | 42 ++++++++--------- 4 files changed, 105 insertions(+), 58 deletions(-) create mode 100644 sound_objects/__init__.py rename operator_add_speakers_to_objects.py => sound_objects/operator_add_speakers_to_objects.py (93%) rename operator_adm_export.py => sound_objects/operator_adm_export.py (95%) rename operator_wav_import.py => sound_objects/operator_wav_import.py (73%) diff --git a/sound_objects/__init__.py b/sound_objects/__init__.py new file mode 100644 index 0000000..8aa0733 --- /dev/null +++ b/sound_objects/__init__.py @@ -0,0 +1,47 @@ +import bpy + +from .operator_add_speakers_to_objects import AddSoundToMeshOperator +from .operator_adm_export import ADMWaveExport +from .operator_wav_import import ImportWav + +bl_info = { + "name": "Sound Objects", + "description": "Tools for adding sounds to objects and export to immersive format", + "author": "Jamie Hardt", + "version": (0, 1), + "warning": "Requires `ear` EBU ADM Renderer package to be installed", + "blender": (2, 90, 0) + #"category": "Import-Export" +} + + +def import_wav_menu_callback(self, context): + self.layout.operator(ImportWav.bl_idname, text="WAV Audio Files (.wav)") + + +def export_adm_menu_callback(self, context): + self.layout.operator(ADMWaveExport.bl_idname, text="ADM Broadcast-WAVE (.wav)") + + +def add_sound_to_mesh_menu_callback(self, context): + self.layout.operator(AddSoundToMeshOperator.bl_idname, icon='SPEAKER') + + +def register(): + bpy.utils.register_class(AddSoundToMeshOperator) + bpy.utils.register_class(ADMWaveExport) + bpy.utils.register_class(ImportWav) + + bpy.types.TOPBAR_MT_file_import.append(import_wav_menu_callback) + bpy.types.TOPBAR_MT_file_export.append(export_adm_menu_callback) + bpy.types.VIEW3D_MT_object.append(add_sound_to_mesh_menu_callback) + + +def unregister(): + bpy.utils.unregister_class(AddSoundToMeshOperator) + bpy.utils.unregister_class(ADMWaveExport) + bpy.utils.unregister_class(ImportWav) + + bpy.types.TOPBAR_MT_file_import.remove(import_wav_menu_callback) + bpy.types.TOPBAR_MT_file_export.remove(export_adm_menu_callback) + bpy.types.VIEW3D_MT_object.remove(add_sound_to_mesh_menu_callback) diff --git a/operator_add_speakers_to_objects.py b/sound_objects/operator_add_speakers_to_objects.py similarity index 93% rename from operator_add_speakers_to_objects.py rename to sound_objects/operator_add_speakers_to_objects.py index eb2c272..94832ef 100644 --- a/operator_add_speakers_to_objects.py +++ b/sound_objects/operator_add_speakers_to_objects.py @@ -17,14 +17,14 @@ from typing import List import sys -bl_info = { - "name": "Add Sounds to Objects", - "description": "Adds sounds to selected mesh objects", - "author": "Jamie Hardt", - "version": (0, 21), - "blender": (2, 90, 0), - "category": "Object", -} +# bl_info = { +# "name": "Add Sounds to Objects", +# "description": "Adds sounds to selected mesh objects", +# "author": "Jamie Hardt", +# "version": (0, 21), +# "blender": (2, 90, 0), +# "category": "Object", +# } class SoundBank: def __init__(self, prefix): @@ -300,20 +300,20 @@ class AddSoundToMeshOperator(Operator): return {'FINISHED'} -def menu_func(self, context): - self.layout.operator(AddSoundToMeshOperator.bl_idname, icon='SPEAKER') +# def menu_func(self, context): +# self.layout.operator(AddSoundToMeshOperator.bl_idname, icon='SPEAKER') -def register(): - bpy.utils.register_class(AddSoundToMeshOperator) - bpy.types.VIEW3D_MT_object.append(menu_func) +# def register(): +# bpy.utils.register_class(AddSoundToMeshOperator) +# bpy.types.VIEW3D_MT_object.append(menu_func) -def unregister(): - bpy.utils.unregister_class(AddSoundToMeshOperator) - bpy.types.VIEW3D_MT_object.remove(menu_func) +# def unregister(): +# bpy.utils.unregister_class(AddSoundToMeshOperator) +# bpy.types.VIEW3D_MT_object.remove(menu_func) -if __name__ == "__main__": - register() +# if __name__ == "__main__": +# register() diff --git a/operator_adm_export.py b/sound_objects/operator_adm_export.py similarity index 95% rename from operator_adm_export.py rename to sound_objects/operator_adm_export.py index 1bb42f3..5799602 100644 --- a/operator_adm_export.py +++ b/sound_objects/operator_adm_export.py @@ -29,15 +29,15 @@ from math import sqrt from dataclasses import dataclass from typing import List, Tuple -bl_info = { - "name": "Export ADM Broadcast-WAV File", - "description": "Export a Broadcast-WAV with each speaker as an ADM object", - "author": "Jamie Hardt", - "version": (0, 23), - "warning": "Requires `ear` EBU ADM Renderer package to be installed", - "blender": (2, 90, 0), - "category": "Import-Export", -} +# bl_info = { +# "name": "Export ADM Broadcast-WAV File", +# "description": "Export a Broadcast-WAV with each speaker as an ADM object", +# "author": "Jamie Hardt", +# "version": (0, 23), +# "warning": "Requires `ear` EBU ADM Renderer package to be installed", +# "blender": (2, 90, 0), +# "category": "Import-Export", +# } class FrameInterval: def __init__(self, start_frame, end_frame): @@ -473,20 +473,20 @@ class ADMWaveExport(Operator, ExportHelper): # Only needed if you want to add into a dynamic menu -def menu_func_export(self, context): - self.layout.operator(ADMWaveExport.bl_idname, text="ADM Broadcast-WAVE (.wav)") +# def menu_func_export(self, context): +# self.layout.operator(ADMWaveExport.bl_idname, text="ADM Broadcast-WAVE (.wav)") -def register(): - bpy.utils.register_class(ADMWaveExport) - bpy.types.TOPBAR_MT_file_export.append(menu_func_export) +# def register(): +# bpy.utils.register_class(ADMWaveExport) +# bpy.types.TOPBAR_MT_file_export.append(menu_func_export) -def unregister(): - bpy.utils.unregister_class(ADMWaveExport) - bpy.types.TOPBAR_MT_file_export.remove(menu_func_export) +# def unregister(): +# bpy.utils.unregister_class(ADMWaveExport) +# bpy.types.TOPBAR_MT_file_export.remove(menu_func_export) -if __name__ == "__main__": - register() +# if __name__ == "__main__": +# register() diff --git a/operator_wav_import.py b/sound_objects/operator_wav_import.py similarity index 73% rename from operator_wav_import.py rename to sound_objects/operator_wav_import.py index 5a0326a..81ea521 100644 --- a/operator_wav_import.py +++ b/sound_objects/operator_wav_import.py @@ -1,17 +1,17 @@ import bpy import os -bl_info = { - "name": "Import WAV Files", - "description": "Import WAV files, with options to automatically pack and Fake user", - "author": "Jamie Hardt", - "version": (0, 20), - "blender": (2, 90, 0), - "location": "File > Import > WAV Audio Files", - "warning": "", # used for warning icon and text in addons panel - "support": "COMMUNITY", - "category": "Import-Export", -} +# bl_info = { +# "name": "Import WAV Files", +# "description": "Import WAV files, with options to automatically pack and Fake user", +# "author": "Jamie Hardt", +# "version": (0, 20), +# "blender": (2, 90, 0), +# "location": "File > Import > WAV Audio Files", +# "warning": "", # used for warning icon and text in addons panel +# "support": "COMMUNITY", +# "category": "Import-Export", +# } def read_some_data(context, filepath, pack, dir, fake): @@ -85,22 +85,22 @@ class ImportWav(Operator, ImportHelper): # Only needed if you want to add into a dynamic menu -def menu_func_import(self, context): - self.layout.operator(ImportWav.bl_idname, text="WAV Audio Files (.wav)") +# def menu_func_import(self, context): +# self.layout.operator(ImportWav.bl_idname, text="WAV Audio Files (.wav)") -def register(): - bpy.utils.register_class(ImportWav) - bpy.types.TOPBAR_MT_file_import.append(menu_func_import) +# def register(): +# bpy.utils.register_class(ImportWav) +# bpy.types.TOPBAR_MT_file_import.append(menu_func_import) -def unregister(): - bpy.utils.unregister_class(ImportWav) - bpy.types.TOPBAR_MT_file_import.remove(menu_func_import) +# def unregister(): +# bpy.utils.unregister_class(ImportWav) +# bpy.types.TOPBAR_MT_file_import.remove(menu_func_import) -if __name__ == "__main__": - register() +# if __name__ == "__main__": +# register() # test call # bpy.ops.import_test.wav_file_batch('INVOKE_DEFAULT')