diff --git a/pype/hosts/celaction/hooks/pre_celaction_registers.py b/pype/hosts/celaction/hooks/pre_celaction_registers.py index 1e836a2d63..8f6b1b72bb 100644 --- a/pype/hosts/celaction/hooks/pre_celaction_registers.py +++ b/pype/hosts/celaction/hooks/pre_celaction_registers.py @@ -7,10 +7,7 @@ from pype.hosts.celaction import api as celaction class CelactionPrelaunchHook(PreLaunchHook): """ - This hook will check if current workfile path has Unreal - project inside. IF not, it initialize it and finally it pass - path to the project by environment variable to Unreal launcher - shell script. + Bootstrap celacion with pype """ workfile_ext = "scn" app_groups = ["celaction"] diff --git a/pype/hosts/unreal/__init__.py b/pype/hosts/unreal/api/__init__.py similarity index 74% rename from pype/hosts/unreal/__init__.py rename to pype/hosts/unreal/api/__init__.py index 939be48d1e..15479ba952 100644 --- a/pype/hosts/unreal/__init__.py +++ b/pype/hosts/unreal/api/__init__.py @@ -3,13 +3,16 @@ import logging from avalon import api as avalon from pyblish import api as pyblish -from pype import PLUGINS_DIR +import pype.hosts.unreal logger = logging.getLogger("pype.hosts.unreal") -PUBLISH_PATH = os.path.join(PLUGINS_DIR, "unreal", "publish") -LOAD_PATH = os.path.join(PLUGINS_DIR, "unreal", "load") -CREATE_PATH = os.path.join(PLUGINS_DIR, "unreal", "create") +HOST_DIR = os.path.dirname(os.path.abspath(pype.hosts.unreal.__file__)) +PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") +LOAD_PATH = os.path.join(PLUGINS_DIR, "load") +CREATE_PATH = os.path.join(PLUGINS_DIR, "create") +INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") def install(): diff --git a/pype/hosts/unreal/lib.py b/pype/hosts/unreal/api/lib.py similarity index 100% rename from pype/hosts/unreal/lib.py rename to pype/hosts/unreal/api/lib.py diff --git a/pype/hosts/unreal/plugin.py b/pype/hosts/unreal/api/plugin.py similarity index 100% rename from pype/hosts/unreal/plugin.py rename to pype/hosts/unreal/api/plugin.py diff --git a/pype/hooks/unreal/pre_workfile_preparation.py b/pype/hosts/unreal/hooks/pre_workfile_preparation.py similarity index 98% rename from pype/hooks/unreal/pre_workfile_preparation.py rename to pype/hosts/unreal/hooks/pre_workfile_preparation.py index f0e09669dc..942cb3bdab 100644 --- a/pype/hooks/unreal/pre_workfile_preparation.py +++ b/pype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -4,7 +4,7 @@ from pype.lib import ( PreLaunchHook, ApplicationLaunchFailed ) -from pype.hosts.unreal import lib as unreal_lib +from pype.hosts.unreal.api import lib as unreal_lib class UnrealPrelaunchHook(PreLaunchHook): diff --git a/pype/plugins/__init__.py b/pype/hosts/unreal/plugins/__init__.py similarity index 100% rename from pype/plugins/__init__.py rename to pype/hosts/unreal/plugins/__init__.py diff --git a/pype/plugins/unreal/create/create_layout.py b/pype/hosts/unreal/plugins/create/create_layout.py similarity index 100% rename from pype/plugins/unreal/create/create_layout.py rename to pype/hosts/unreal/plugins/create/create_layout.py diff --git a/pype/plugins/unreal/create/create_staticmeshfbx.py b/pype/hosts/unreal/plugins/create/create_staticmeshfbx.py similarity index 94% rename from pype/plugins/unreal/create/create_staticmeshfbx.py rename to pype/hosts/unreal/plugins/create/create_staticmeshfbx.py index fa41590ef5..8f414ac56d 100644 --- a/pype/plugins/unreal/create/create_staticmeshfbx.py +++ b/pype/hosts/unreal/plugins/create/create_staticmeshfbx.py @@ -1,5 +1,5 @@ import unreal -from pype.hosts.unreal.plugin import Creator +from pype.hosts.unreal.api.plugin import Creator from avalon.unreal import ( instantiate, ) diff --git a/pype/plugins/unreal/load/load_animation.py b/pype/hosts/unreal/plugins/load/load_animation.py similarity index 100% rename from pype/plugins/unreal/load/load_animation.py rename to pype/hosts/unreal/plugins/load/load_animation.py diff --git a/pype/plugins/unreal/load/load_rig.py b/pype/hosts/unreal/plugins/load/load_rig.py similarity index 100% rename from pype/plugins/unreal/load/load_rig.py rename to pype/hosts/unreal/plugins/load/load_rig.py diff --git a/pype/plugins/unreal/load/load_setdress.py b/pype/hosts/unreal/plugins/load/load_setdress.py similarity index 100% rename from pype/plugins/unreal/load/load_setdress.py rename to pype/hosts/unreal/plugins/load/load_setdress.py diff --git a/pype/plugins/unreal/load/load_staticmeshfbx.py b/pype/hosts/unreal/plugins/load/load_staticmeshfbx.py similarity index 100% rename from pype/plugins/unreal/load/load_staticmeshfbx.py rename to pype/hosts/unreal/plugins/load/load_staticmeshfbx.py diff --git a/pype/plugins/unreal/publish/collect_current_file.py b/pype/hosts/unreal/plugins/publish/collect_current_file.py similarity index 100% rename from pype/plugins/unreal/publish/collect_current_file.py rename to pype/hosts/unreal/plugins/publish/collect_current_file.py diff --git a/pype/plugins/unreal/publish/collect_instances.py b/pype/hosts/unreal/plugins/publish/collect_instances.py similarity index 100% rename from pype/plugins/unreal/publish/collect_instances.py rename to pype/hosts/unreal/plugins/publish/collect_instances.py diff --git a/pype/plugins/unreal/publish/extract_layout.py b/pype/hosts/unreal/plugins/publish/extract_layout.py similarity index 100% rename from pype/plugins/unreal/publish/extract_layout.py rename to pype/hosts/unreal/plugins/publish/extract_layout.py