birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into LoadPipelineFromGitHub

Browse Source
This commit is contained in:
Brian Herrera
2021-03-26 17:05:57 -07:00
parent e8bbb5a0d5 cfd7789a49
commit 39f53338bf
765 changed files with 11513 additions and 20246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
-2
View File
@@ -34,7 +34,6 @@ ly_add_target(
ly_add_target(
NAME Atom_AtomBridge ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.Atom_AtomBridge.b55b2738aa4a46c8b034fe98e6e5158b.v0.1.0
FILES_CMAKE
atombridge_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -54,7 +53,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME Atom_AtomBridge.Editor ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.Atom_AtomBridge.Editor.b55b2738aa4a46c8b034fe98e6e5158b.v0.1.0
FILES_CMAKE
atombridge_editor_files.cmake
INCLUDE_DIRECTORIES
Gems/AtomLyIntegration/AtomBridge/Code/Source/FlyCameraInputComponent.h
+1 -1
View File
@@ -32,7 +32,7 @@ namespace AZ
static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
static void Reflect(AZ::ReflectContext* reflection);
AZ_COMPONENT(FlyCameraInputComponent, "{EB588B1E-AC2E-44AA-A1E6-E5960942E950}");
AZ_COMPONENT(FlyCameraInputComponent, "{7AE0D6AD-691C-41B6-9DD5-F23F78B1A02E}");
virtual ~FlyCameraInputComponent();
// AZ::Component
Gems/AtomLyIntegration/AtomImGuiTools/Code/CMakeLists.txt
-1
View File
@@ -29,7 +29,6 @@ ly_add_target(
ly_add_target(
NAME AtomImGuiTools ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.AtomImGuiTools.1a9d10de1b8a45fab2fe04517f613962.v0.1.0
FILES_CMAKE
atomimguitools_shared_files.cmake
INCLUDE_DIRECTORIES
Gems/AtomLyIntegration/CommonFeatures/AssetProcessorGemConfig.ini
-4
View File
@@ -1,4 +0,0 @@
[RC PostFxLayerCategories]
glob=*.postfxlayercategories
params=copy
productAssetType={A18B1B11-4C1E-4C1B-9643-178E8ED27019}
Gems/AtomLyIntegration/CommonFeatures/AssetProcessorGemConfig.setreg
+13
View File
@@ -0,0 +1,13 @@
{
"Amazon": {
"AssetProcessor": {
"Settings": {
"RC PostFxLayerCategories": {
"glob": "*.postfxlayercategories",
"params": "copy",
"productAssetType": "{A18B1B11-4C1E-4C1B-9643-178E8ED27019}"
}
}
}
}
}
Gems/AtomLyIntegration/CommonFeatures/Code/CMakeLists.txt
+2 -3
View File
@@ -50,7 +50,6 @@ ly_add_target(
ly_add_target(
NAME AtomLyIntegration_CommonFeatures ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.AtomLyIntegration_CommonFeatures.4e981f3b17394f5d84d674fff0f54f4f.v0.1.0
FILES_CMAKE
atomlyintegration_commonfeatures_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -65,9 +64,9 @@ ly_add_target(
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME AtomLyIntegration_CommonFeatures.Editor MODULE
NAME AtomLyIntegration_CommonFeatures.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.AtomLyIntegration_CommonFeatures.Editor.4e981f3b17394f5d84d674fff0f54f4f.v0.1.0
AUTOUIC
AUTOMOC
AUTORCC
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
+4
View File
@@ -255,6 +255,10 @@ namespace AZ
void MaterialComponentController::SetMaterialOverrides(const MaterialAssignmentMap& materials)
{
// this function is called twice once material asset is changed, a temp variable is
// needed to prevent material asset going out of scope during second call
// before LoadMaterials() is called [LYN-2249]
auto temp = m_configuration.m_materials;
m_configuration.m_materials = materials;
LoadMaterials();
}
Gems/AtomLyIntegration/EMotionFXAtom/Code/CMakeLists.txt
+2 -3
View File
@@ -35,7 +35,6 @@ ly_add_target(
ly_add_target(
NAME EMotionFX_Atom ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.EMotionFX_Atom.4f8a4d073ba34b43be45705f18705f1e.v0.1.0
FILES_CMAKE
emotionfxatom_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -51,9 +50,9 @@ ly_add_target(
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME EMotionFX_Atom.Editor MODULE
NAME EMotionFX_Atom.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.EMotionFX_Atom.Editor.4f8a4d073ba34b43be45705f18705f1e.v0.1.0
FILES_CMAKE
emotionfx_atom_editor_files.cmake
INCLUDE_DIRECTORIES
Gems/AtomLyIntegration/ImguiAtom/Code/CMakeLists.txt
-1
View File
@@ -30,7 +30,6 @@ ly_add_target(
ly_add_target(
NAME ImguiAtom ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.ImguiAtom.9986e22e14184f2fb6bb1e7dd185b2f9.v0.1.0
FILES_CMAKE
imguiatom_shared_files.cmake
INCLUDE_DIRECTORIES
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Code/CMakeLists.txt
-1
View File
@@ -27,7 +27,6 @@ ly_add_target(
ly_add_target(
NAME DccScriptingInterface.Editor ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.Atom_DccScriptingInterface.Editor.7bf5a77dacd8438bb4966a66b5a678d8.v0.1.0
FILES_CMAKE
dccscriptinginterface_shared_files.cmake
INCLUDE_DIRECTORIES
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
+2 -2
View File
@@ -85,7 +85,7 @@ from pathlib import Path
# get/set the project name
_LY_DEV = os.getenv(constants.ENVAR_LY_DEV,
config_utils.get_stub_check_path(in_path=os.getcwd(),
check_stub='engineroot.txt'))
check_stub='engine.json'))
# get/set the project name
_LY_PROJECT_TAG = os.getenv(constants.ENVAR_LY_PROJECT,
@@ -94,8 +94,8 @@ _LY_PROJECT_TAG = os.getenv(constants.ENVAR_LY_PROJECT,
# project cache log dir path
_DCCSI_LOG_PATH = Path(os.getenv(constants.ENVAR_DCCSI_LOG_PATH,
Path(_LY_DEV,
_LY_PROJECT_TAG,
'Cache',
_LY_PROJECT_TAG,
'pc', 'user', 'log', 'logs')))
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
+1 -21
View File
@@ -30,7 +30,7 @@ _LOGGER = _logging.getLogger(_PACKAGENAME)
_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
__all__ = ['get_os', 'return_stub', 'get_stub_check_path',
'get_dccsi_config', 'get_current_project']
'get_dccsi_config']
# note: this module should reamin py2.7 compatible (Maya) so no f'strings
# -------------------------------------------------------------------------
@@ -135,23 +135,6 @@ def get_dccsi_config(dccsi_dirpath=return_stub_dir()):
return None
# -------------------------------------------------------------------------
# -------------------------------------------------------------------------
def get_current_project(dev_folder=get_stub_check_path()):
"""Uses regex in lumberyard Dev\\bootstrap.cfg to retreive project tag str"""
boostrap_filepath = Path(dev_folder, "bootstrap.cfg")
if boostrap_filepath.exists():
bootstrap = open(str(boostrap_filepath), "r")
game_project_regex = re.compile(r"^sys_game_folder\s*=\s*(.*)")
for line in bootstrap:
game_folder_match = game_project_regex.match(line)
if game_folder_match:
_LOGGER.debug('Project is: {}'.format(game_folder_match.group(1)))
return game_folder_match.group(1)
return None
# -------------------------------------------------------------------------
# -------------------------------------------------------------------------
def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()):
"""Builds and adds local site dir libs based on py version"""
@@ -192,9 +175,6 @@ if __name__ == '__main__':
_LOGGER.info('DCCSI_CONFIG_PATH: {}'.format(_config))
_LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engineroot.txt')))
_LOGGER.info('LY_PROJECT: {}'.format(get_current_project(get_stub_check_path('engineroot.txt'))))
_LOGGER.info('DCCSI_PYTHON_LIB_PATH: {}'.format(bootstrap_dccsi_py_libs(return_stub_dir('dccsi_stub'))))