LYN-2537 engine assets (#254)

* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
This commit is contained in:
lumberyard-employee-dm
2021-04-28 21:38:43 -05:00
committed by GitHub
parent ed74bb9166
commit 3dec5d3b71
2087 changed files with 1208 additions and 3655 deletions
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:423ca7cc5b4a2df64cd31781772fcf099485ec3ab44cd7353afd85fdebcdff70
size 3538
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db1535dfa207940127002f3bfefbb08509bc1803b179197fdff43bf9d01657df
size 1168
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=HDRCubemapRGBK_highQ /reduce=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16d933a62ce42c3d1e2082db34248ac9b8f9523423752506c25b9c33520b0209
size 3148003
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a268774eb6d4d4590960c28edbf2a35d3fb7a73caab38d9ad15812c3df1c0c02
size 4529
@@ -0,0 +1 @@
/autooptimizefile=0 /dns=0 /preset=Diffuse_highQ /reduce=0 /ser=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a993ca7b260014be203dfbcbe6064ea8ec03a6ec66b8f4afd220867f6f8e18b0
size 17206
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage_NoSrgb /reduce=-1 /ser=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fd2bf67390d06f52597c54eabead09dedd50c4484c818b68f27aaa7e3c34ba4
size 21972
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45a60cfdb575835df036c69060bb4b29361d3966bd673d97efcc704fc4cb6c07
size 1056136
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b5e13697bd4ea81f14f9b081c45f21915d1708aa0016c3f1831f9099f2d81eb
size 1056152
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1efa5c1e51858933ac5a72e78f37488da1a9cb1d80b53ff5fa7c496b55d678cc
size 431
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=MergedDetailMap /reduce=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e5bd1ea5a3b122d459d77d74a78cf375680c2756c9b291adc9f2b5d30681462
size 1152
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99703d2e8dc577ec1591f88d55a3ebf4e65194512dfa236cae7b69ea33f585a9
size 3473
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Gradient /reduce=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f51c0778122da00197d9395bee100ce911a6565734fccdae693ca5f19a9c230
size 1152
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:790a11459b577d50f00c0a5fc6cffaf275142bce57d297d9fa02fa95ecaa0263
size 2176
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60a366c2b9499a085df672a5c227f8892de3f628bd92f0317b514a548cd71d14
size 2348
@@ -0,0 +1 @@
/autooptimizefile=0 /dns=1 /mipmaps=0 /preset=Uncompressed
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7387bff8d94078be705ae422ef158a11f1c153677981142b49d4862a8e288c5f
size 17206
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage_NoSrgb /reduce=-1 /ser=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d962e98843482e3eae63f4ad6b7cf828712dd7c5d234c9281a576840a239d5fb
size 1052998
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=SF_Image /reduce=0 /ser=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1dddb54cf1a5be262e2bb842dd97696be0119fcff42b3cdb46a12117445110d
size 198956
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=SF_Image /reduce=0 /ser=0
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94f90a6cf57f680eaaac836e35a0b7e3dd92bbf7e21dcad689ba34b64f431574
size 310
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Diffuse_lowQ
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:09ef87c3b5538c599d18312d9d93133ae1c80b20e9069b9db26c71333a5a1894
size 65664
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa4c2cc16af7e442d9d828087a56e295d071c41939bd3846bc0dc92520b0b7df
size 790872
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d9854402feb18ed483c16c70241f52e680e8c723a0b1950107eef0e9bf29080
size 17472
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ColorChart
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c181af84676aee6732bfd7a3171e6cc0989e826df3a0175b93149be0128ad09
size 13126
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f83408f5be5e3c0b71f749338738884ffba4da1934fa59aaf3bac14a7f99d60d
size 13126
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ff88186273d111ee3970626106550fffee3724317ff593c5ae772d198251b72
size 13126
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff67e4b0bcd86d52555c1758d0b3f0b5735efa20c9dda29039c13adebdb43e4b
size 13124
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4722bd7c54465e26a5cd02a81a0bbf1a29723df120999597ecebd90e2dcc62b7
size 794016
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14270aa89ebece4066186f0e2c44e649ef186d393b744e11c16cee5ec86cad03
size 267632
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b73c9acf07a788406561f8bc4769da87f08a70db15c758f41155ed9ce3060dea
size 176
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb308cbf964b143199b913fc3131c68606659f7710648b079ae702da95ecfb59
size 176
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c77ba9db464c6b31dbd708d45fa2fc2efaec9d707bd260c4751cd678dfe346c
size 793958
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:137939729f93182e8fd0dc8363e0bdcee796fc87273c10e93adb3947b65ebcf7
size 793958
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c1d84cca5c354e21af51823920fe2823fba4a2fffa9fa41fced489b81019090
size 793958
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8924ed3a3e55a182d4968c3f8e5f41888e05855f632b25f46d41a406dd0aa492
size 793962
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39ac7b3a670d78e4f7846bd98ae8e5abe5eaebc914d2d477b6f221b78523d87e
size 793962
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a398be45e9d505c6630951754e73cde1e122fa11347a613ea3f7fd1e46b8db8
size 793956
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83f6c11eb3297e6b2293947da0b23cb847b27a030e22763de578f34ab7a3313a
size 794050
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:631da85e4104df95ac439cde3104f35337be5454e63e20648f93c862a1e70c08
size 794050
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8627c0f73a249364dae7354d4e1dfa6c0f5c95335d5261153aa9b1514939c2c
size 790877
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f640d0b47bee027916a1b521caa66df374fe9f775e52f42bb4b4d9d8ab10994
size 790869
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fec00c80ab81af76176ee5073f6371e26ed0d571dd90dce7a179026125a87aa0
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a050c8cd0d529e6c8de4eac5208696bd71d9fc68c8339427ea5f5f13f9c88d54
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49a8aa0008e248669c7972717e3eec67ac29632d903d1dcced34c4e236fafcf6
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76b338b371b44807169eaaf83f7cfa3fa901ac0898982e2adb2438f12560b669
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0841184dd71588598ebbe85ec798141f13916414cca14d221128a24c3da4ae5
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:501707ed6d406e1092a8a2785b5aa50c36b93cdfa6c75d7f525cfe377fa63554
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15c2a87908377086f513ca4234a1987fd70b29309879ea4006d4858ae9717de9
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a6374b5b1b90ce2bae2f3f47a7f40323baf64a39a01d02efc90669519138748
size 27908
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=ReferenceImage
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2814503c64308e8beb1fbe302b205450f150a6ba4f798793fed97c82d615aec
size 794062
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c37d3db5176041d8702462dba6c1e1c4bff1aecd99f18a8d2b4c4f053601ec0f
size 794058
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:265ae231486dc6d5d61aa2416b0010ea743722f7238660faeed9edacd46e8a6b
size 6303186
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bec356e60aa7ca108bd0d03eefde867eafa8b7c1b20d3797d0cc8cbdeb06648d
size 794058
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:388a880d5d678578c4b7813423a1c468232fdec811b2c04122a50f2fe3b490e7
size 794058
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f9991d8c0a8e9d4b8d067cdd2bca01c1dc0d9460c92d038ff7c823930b4f2df
size 794060
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fa816ae4ee1a729e137fe568b3f4556d3e470110d71e43717ad43c80159ce22
size 202178
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e1f49250a2a07597550717764d8e322c26de96ad1bec56d167a7345aecce595
size 202184
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a27b92aa9639a6aa940e08d26dfed1a4e7d0e1fd8f2619d4809dc656f2677e8a
size 202184
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8ce1d69a2f3bb7d5da1d7dfe87a6a5712c0890645eaa6f24caa54665f3b4efc
size 798173
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b34e12872f9a1d5a0b70cd1dfb3c6e20b0b14d68896a642ce1a4c42803f76b90
size 53702
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61bf33e6e739832cbff12fe789756639ffc52f08d28db4d99ce47b4ae3de3a59
size 794066
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d769fadcd0d1b20cf44b105551ce5ae403376f8a168a2aca92d21db8cde8ee3
size 794056
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a83f72076ae762808b7c3173b9beef754b58163883a470b5b68563f302b9581
size 794060
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8eb26394629105cbe1595eb034094e4b8104ba833bc767e0382ec32d985a28ae
size 808996
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:32e1b029417e3a9caff71744a396ad4eb84f3fd6653fb8bb1b18528710016053
size 794076
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14de7594947439df9bcc984028568f604784699ca3724d52333f9f4d0c0bdaec
size 6300034
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9066ff9efb84d409b43a0608334e5b90cc762b7c68361f663cf645d96a5e579d
size 87508
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7910413d84f4e9749963ed3b0ad9a3acccddc4a29448e2a754412f5b58c49ad6
size 896
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0d0de8ebc89184b7c2263aac6b733ffccfe7409e5c1a52496749fc2bc558224
size 198887
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Diffuse_highQ
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da9f41e52140a76be2231f96839df627fa4afcf583ae607eb24fc45ca770b6f7
size 87508
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad762bd8660396808ec8a9d3ef1831f0c1deddbbccac75884dda6f3f051f616e
size 25182583
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Normalmap_highQ /reduce="pc:1"
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92c252b664982ecd184335eb946442ef615d0da245489f84a844834335924fa3
size 25182588
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Diffuse_lowQ /reduce="pc:1"
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2eb5576242217caaf4d8332bdde2a9716b238c57d8c0965eced06f9db1bae55f
size 192
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9961f8812d463296d812a53ca6f01e6240f9a3f7d8d1f6083ba7d62e2662b547
size 50543
@@ -0,0 +1 @@
/autooptimizefile=0 /mipmaps=0 /preset=Diffuse_lowQ /reduce=-1 /ser=1
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8f5ed1388fa7cb4c7aa50551a15290b54b69bb92f7a958e4887f3b01a9aa5bb
size 50424
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Normalmap_lowQ
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e081233f7f5ebdb51f8503d87e5140053be296291f32dd96a02c0f518f787b3
size 17768
@@ -0,0 +1 @@
/autooptimizefile=0 /mipmaps=0 /preset=Diffuse_highQ /reduce=-1 /ser=1
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0e7205eea74d13546a22d61d245c62a93b312392bb51efb1e87b817f60479de
size 13040

Some files were not shown because too many files have changed in this diff Show More