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/WhiteBox/AssetProcessorGemConfig.ini
-5
View File
@@ -1,5 +0,0 @@
; Copy over WhiteBoxMesh
[RC WhiteBoxMesh]
glob=*.wbm
params=copy
productAssetType={6784304A-4ED6-42FD-A5C9-316265F071F2}
Gems/WhiteBox/AssetProcessorGemConfig.setreg
+13
View File
@@ -0,0 +1,13 @@
{
"Amazon": {
"AssetProcessor": {
"Settings": {
"RC WhiteBoxMesh": {
"glob": "*.wbm",
"params": "copy",
"productAssetType": "{6784304A-4ED6-42FD-A5C9-316265F071F2}"
}
}
}
}
}
Gems/WhiteBox/Code/CMakeLists.txt
+4 -6
View File
@@ -18,7 +18,6 @@ if(NOT PAL_TRAIT_WHITEBOX_SUPPORTED)
ly_add_target(
NAME WhiteBox ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.WhiteBox.c5833dbda2e045d3a5f16b7414280c27.v0.1.0
FILES_CMAKE
whitebox_unsupported_files.cmake
INCLUDE_DIRECTORIES
@@ -32,9 +31,9 @@ if(NOT PAL_TRAIT_WHITEBOX_SUPPORTED)
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME WhiteBox.Editor MODULE
NAME WhiteBox.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.WhiteBox.Editor.c5833dbda2e045d3a5f16b7414280c27.v0.1.0
FILES_CMAKE
whitebox_unsupported_files.cmake
INCLUDE_DIRECTORIES
@@ -75,7 +74,6 @@ ly_add_target(
ly_add_target(
NAME WhiteBox ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.WhiteBox.c5833dbda2e045d3a5f16b7414280c27.v0.1.0
FILES_CMAKE
whitebox_shared_files.cmake
INCLUDE_DIRECTORIES
@@ -117,9 +115,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
)
ly_add_target(
NAME WhiteBox.Editor MODULE
NAME WhiteBox.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.WhiteBox.Editor.c5833dbda2e045d3a5f16b7414280c27.v0.1.0
FILES_CMAKE
whitebox_editor_shared_files.cmake
INCLUDE_DIRECTORIES
Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ namespace UnitTest
void EditorWhiteBoxPhysicsTestEnvironment::AddGemsAndComponents()
{
AddDynamicModulePaths({"Gem.PhysX.Editor.4e08125824434932a0fe3717259caa47.v0.1.0"});
AddDynamicModulePaths({"PhysX.Editor"});
AddComponentDescriptors(
{AzToolsFramework::EditorEntityContextComponent::CreateDescriptor(),
WhiteBox::EditorWhiteBoxComponent::CreateDescriptor(), WhiteBox::WhiteBoxComponent::CreateDescriptor(),