From 8b76a34bec147620f0a93d83e652253eba925d0d Mon Sep 17 00:00:00 2001 From: "kaosat.dev" Date: Sat, 25 May 2024 10:54:23 +0200 Subject: [PATCH] refactor(Blenvy): renaming , moving of auto_export modules --- tools/blenvy/__init__.py | 6 +++--- tools/blenvy/{gltf_auto_export => auto_export}/__init__.py | 0 tools/blenvy/{gltf_auto_export => auto_export}/constants.py | 0 .../auto_export => auto_export/export}/__init__.py | 0 .../auto_export => auto_export/export}/auto_export.py | 2 +- .../auto_export => auto_export/export}/export_blueprints.py | 0 .../auto_export => auto_export/export}/export_gltf.py | 0 .../export}/export_main_scenes.py | 0 .../modules => auto_export/export}/export_materials.py | 2 +- .../export}/get_blueprints_to_export.py | 0 .../export}/get_levels_to_export.py | 0 .../export}/get_standard_exporter_settings.py | 0 .../export}/prepare_and_export.py | 0 .../auto_export => auto_export/export}/project_diff.py | 0 .../auto_export => auto_export/export}/settings_diff.py | 0 .../auto_export => auto_export/export}/tracker.py | 0 .../{gltf_auto_export => auto_export}/helpers/__init__.py | 0 .../helpers/generate_and_export.py | 2 +- .../helpers/generate_complete_preferences_dict.py | 0 .../helpers/helpers_scenes.py | 0 .../helpers/serialize_scene.py | 0 .../helpers/to_remove_later.py | 0 .../{gltf_auto_export => auto_export}/modules/__init__.py | 0 .../modules/bevy_dynamic.py | 0 .../modules/bevy_scene_components.py | 0 tools/blenvy/{gltf_auto_export => auto_export}/settings.py | 0 tools/blenvy/{gltf_auto_export => auto_export}/ui.py | 0 tools/blenvy/core/blenvy_manager.py | 2 +- tools/blenvy/core/ui/ui.py | 2 +- tools/blenvy/tests/test_bevy_integration.py | 2 +- 30 files changed, 9 insertions(+), 9 deletions(-) rename tools/blenvy/{gltf_auto_export => auto_export}/__init__.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/constants.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/__init__.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/auto_export.py (99%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/export_blueprints.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/export_gltf.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/export_main_scenes.py (100%) rename tools/blenvy/{gltf_auto_export/modules => auto_export/export}/export_materials.py (96%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/get_blueprints_to_export.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/get_levels_to_export.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/get_standard_exporter_settings.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/prepare_and_export.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/project_diff.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/settings_diff.py (100%) rename tools/blenvy/{gltf_auto_export/auto_export => auto_export/export}/tracker.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/helpers/__init__.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/helpers/generate_and_export.py (98%) rename tools/blenvy/{gltf_auto_export => auto_export}/helpers/generate_complete_preferences_dict.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/helpers/helpers_scenes.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/helpers/serialize_scene.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/helpers/to_remove_later.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/modules/__init__.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/modules/bevy_dynamic.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/modules/bevy_scene_components.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/settings.py (100%) rename tools/blenvy/{gltf_auto_export => auto_export}/ui.py (100%) diff --git a/tools/blenvy/__init__.py b/tools/blenvy/__init__.py index 4d88849..68116af 100644 --- a/tools/blenvy/__init__.py +++ b/tools/blenvy/__init__.py @@ -30,9 +30,9 @@ from .bevy_components.components.definitions_list import (ComponentDefinitionsLi from .bevy_components.components.ui import (BEVY_COMPONENTS_PT_ComponentsPanel) # auto export -from .gltf_auto_export import gltf_post_export_callback -from .gltf_auto_export.auto_export.tracker import AutoExportTracker -from .gltf_auto_export.settings import AutoExportSettings +from .auto_export import gltf_post_export_callback +from .auto_export.export.tracker import AutoExportTracker +from .auto_export.settings import AutoExportSettings # asset management from .assets.ui import Blenvy_assets diff --git a/tools/blenvy/gltf_auto_export/__init__.py b/tools/blenvy/auto_export/__init__.py similarity index 100% rename from tools/blenvy/gltf_auto_export/__init__.py rename to tools/blenvy/auto_export/__init__.py diff --git a/tools/blenvy/gltf_auto_export/constants.py b/tools/blenvy/auto_export/constants.py similarity index 100% rename from tools/blenvy/gltf_auto_export/constants.py rename to tools/blenvy/auto_export/constants.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/__init__.py b/tools/blenvy/auto_export/export/__init__.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/__init__.py rename to tools/blenvy/auto_export/export/__init__.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/auto_export.py b/tools/blenvy/auto_export/export/auto_export.py similarity index 99% rename from tools/blenvy/gltf_auto_export/auto_export/auto_export.py rename to tools/blenvy/auto_export/export/auto_export.py index ad11848..f8f5e2d 100644 --- a/tools/blenvy/gltf_auto_export/auto_export/auto_export.py +++ b/tools/blenvy/auto_export/export/auto_export.py @@ -11,7 +11,7 @@ from .get_standard_exporter_settings import get_standard_exporter_settings from .export_main_scenes import export_main_scene from .export_blueprints import export_blueprints -from ..modules.export_materials import cleanup_materials, export_materials +from .export_materials import cleanup_materials, export_materials from ..modules.bevy_scene_components import remove_scene_components, upsert_scene_components from ...blueprints.blueprints_scan import blueprints_scan diff --git a/tools/blenvy/gltf_auto_export/auto_export/export_blueprints.py b/tools/blenvy/auto_export/export/export_blueprints.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/export_blueprints.py rename to tools/blenvy/auto_export/export/export_blueprints.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/export_gltf.py b/tools/blenvy/auto_export/export/export_gltf.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/export_gltf.py rename to tools/blenvy/auto_export/export/export_gltf.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/export_main_scenes.py b/tools/blenvy/auto_export/export/export_main_scenes.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/export_main_scenes.py rename to tools/blenvy/auto_export/export/export_main_scenes.py diff --git a/tools/blenvy/gltf_auto_export/modules/export_materials.py b/tools/blenvy/auto_export/export/export_materials.py similarity index 96% rename from tools/blenvy/gltf_auto_export/modules/export_materials.py rename to tools/blenvy/auto_export/export/export_materials.py index 055bd0d..0e6fa98 100644 --- a/tools/blenvy/gltf_auto_export/modules/export_materials.py +++ b/tools/blenvy/auto_export/export/export_materials.py @@ -6,7 +6,7 @@ from ...core.helpers_collections import (traverse_tree) from ...core.object_makers import make_cube from ...materials.materials_helpers import get_all_materials from ..helpers.generate_and_export import generate_and_export -from ..auto_export.export_gltf import (generate_gltf_export_preferences) +from .export_gltf import (generate_gltf_export_preferences) def clear_material_info(collection_names, library_scenes): for scene in library_scenes: diff --git a/tools/blenvy/gltf_auto_export/auto_export/get_blueprints_to_export.py b/tools/blenvy/auto_export/export/get_blueprints_to_export.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/get_blueprints_to_export.py rename to tools/blenvy/auto_export/export/get_blueprints_to_export.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/get_levels_to_export.py b/tools/blenvy/auto_export/export/get_levels_to_export.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/get_levels_to_export.py rename to tools/blenvy/auto_export/export/get_levels_to_export.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/get_standard_exporter_settings.py b/tools/blenvy/auto_export/export/get_standard_exporter_settings.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/get_standard_exporter_settings.py rename to tools/blenvy/auto_export/export/get_standard_exporter_settings.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/prepare_and_export.py b/tools/blenvy/auto_export/export/prepare_and_export.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/prepare_and_export.py rename to tools/blenvy/auto_export/export/prepare_and_export.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/project_diff.py b/tools/blenvy/auto_export/export/project_diff.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/project_diff.py rename to tools/blenvy/auto_export/export/project_diff.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/settings_diff.py b/tools/blenvy/auto_export/export/settings_diff.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/settings_diff.py rename to tools/blenvy/auto_export/export/settings_diff.py diff --git a/tools/blenvy/gltf_auto_export/auto_export/tracker.py b/tools/blenvy/auto_export/export/tracker.py similarity index 100% rename from tools/blenvy/gltf_auto_export/auto_export/tracker.py rename to tools/blenvy/auto_export/export/tracker.py diff --git a/tools/blenvy/gltf_auto_export/helpers/__init__.py b/tools/blenvy/auto_export/helpers/__init__.py similarity index 100% rename from tools/blenvy/gltf_auto_export/helpers/__init__.py rename to tools/blenvy/auto_export/helpers/__init__.py diff --git a/tools/blenvy/gltf_auto_export/helpers/generate_and_export.py b/tools/blenvy/auto_export/helpers/generate_and_export.py similarity index 98% rename from tools/blenvy/gltf_auto_export/helpers/generate_and_export.py rename to tools/blenvy/auto_export/helpers/generate_and_export.py index 00f5221..7496397 100644 --- a/tools/blenvy/gltf_auto_export/helpers/generate_and_export.py +++ b/tools/blenvy/auto_export/helpers/generate_and_export.py @@ -1,5 +1,5 @@ import bpy -from ..auto_export.export_gltf import export_gltf +from ..export.export_gltf import export_gltf from ...core.helpers_collections import (set_active_collection) """ diff --git a/tools/blenvy/gltf_auto_export/helpers/generate_complete_preferences_dict.py b/tools/blenvy/auto_export/helpers/generate_complete_preferences_dict.py similarity index 100% rename from tools/blenvy/gltf_auto_export/helpers/generate_complete_preferences_dict.py rename to tools/blenvy/auto_export/helpers/generate_complete_preferences_dict.py diff --git a/tools/blenvy/gltf_auto_export/helpers/helpers_scenes.py b/tools/blenvy/auto_export/helpers/helpers_scenes.py similarity index 100% rename from tools/blenvy/gltf_auto_export/helpers/helpers_scenes.py rename to tools/blenvy/auto_export/helpers/helpers_scenes.py diff --git a/tools/blenvy/gltf_auto_export/helpers/serialize_scene.py b/tools/blenvy/auto_export/helpers/serialize_scene.py similarity index 100% rename from tools/blenvy/gltf_auto_export/helpers/serialize_scene.py rename to tools/blenvy/auto_export/helpers/serialize_scene.py diff --git a/tools/blenvy/gltf_auto_export/helpers/to_remove_later.py b/tools/blenvy/auto_export/helpers/to_remove_later.py similarity index 100% rename from tools/blenvy/gltf_auto_export/helpers/to_remove_later.py rename to tools/blenvy/auto_export/helpers/to_remove_later.py diff --git a/tools/blenvy/gltf_auto_export/modules/__init__.py b/tools/blenvy/auto_export/modules/__init__.py similarity index 100% rename from tools/blenvy/gltf_auto_export/modules/__init__.py rename to tools/blenvy/auto_export/modules/__init__.py diff --git a/tools/blenvy/gltf_auto_export/modules/bevy_dynamic.py b/tools/blenvy/auto_export/modules/bevy_dynamic.py similarity index 100% rename from tools/blenvy/gltf_auto_export/modules/bevy_dynamic.py rename to tools/blenvy/auto_export/modules/bevy_dynamic.py diff --git a/tools/blenvy/gltf_auto_export/modules/bevy_scene_components.py b/tools/blenvy/auto_export/modules/bevy_scene_components.py similarity index 100% rename from tools/blenvy/gltf_auto_export/modules/bevy_scene_components.py rename to tools/blenvy/auto_export/modules/bevy_scene_components.py diff --git a/tools/blenvy/gltf_auto_export/settings.py b/tools/blenvy/auto_export/settings.py similarity index 100% rename from tools/blenvy/gltf_auto_export/settings.py rename to tools/blenvy/auto_export/settings.py diff --git a/tools/blenvy/gltf_auto_export/ui.py b/tools/blenvy/auto_export/ui.py similarity index 100% rename from tools/blenvy/gltf_auto_export/ui.py rename to tools/blenvy/auto_export/ui.py diff --git a/tools/blenvy/core/blenvy_manager.py b/tools/blenvy/core/blenvy_manager.py index 2b60d81..1371b5f 100644 --- a/tools/blenvy/core/blenvy_manager.py +++ b/tools/blenvy/core/blenvy_manager.py @@ -4,7 +4,7 @@ from bpy_types import (PropertyGroup) from bpy.props import (EnumProperty, PointerProperty, StringProperty, CollectionProperty, IntProperty) from .scene_helpers import SceneSelector from ..settings import upsert_settings, load_settings -import blenvy.gltf_auto_export.settings as auto_export_settings +import blenvy.auto_export.settings as auto_export_settings def update_scene_lists(self, context): blenvy = self# context.window_manager.blenvy diff --git a/tools/blenvy/core/ui/ui.py b/tools/blenvy/core/ui/ui.py index 7f77ecd..100926b 100644 --- a/tools/blenvy/core/ui/ui.py +++ b/tools/blenvy/core/ui/ui.py @@ -1,6 +1,6 @@ import bpy import blenvy.bevy_components.ui as components_ui -import blenvy.gltf_auto_export.ui as auto_export_ui +import blenvy.auto_export.ui as auto_export_ui from blenvy.settings import load_settings # from ...bevy_components.components import ui# as components_ui ###################################################### diff --git a/tools/blenvy/tests/test_bevy_integration.py b/tools/blenvy/tests/test_bevy_integration.py index 596ecc9..b1709f1 100644 --- a/tools/blenvy/tests/test_bevy_integration.py +++ b/tools/blenvy/tests/test_bevy_integration.py @@ -9,7 +9,7 @@ import filecmp from PIL import Image from pixelmatch.contrib.PIL import pixelmatch -from blenvy.gltf_auto_export.auto_export.prepare_and_export import prepare_and_export +from blenvy.auto_export.export.prepare_and_export import prepare_and_export @pytest.fixture def setup_data(request):