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
committed by
GitHub
GitHub
parent
ed74bb9166
commit
3dec5d3b71
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5e9e1371fb108a057d246935b01374f2bb86ae0b126bae471176ce62284eacd7
|
||||
size 793918
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /dns=0 /preset=Uncompressed /reduce=0 /ser=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1b56097f0df01da7ed49311462002f5e1a61b8496306c7ab3b12e17c27afb28a
|
||||
size 793918
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba52ff6d59f50b4b5dea6e266572c9e7feb92d5fd85bd0738e0d07d42d234bf7
|
||||
size 810996
|
||||
@@ -0,0 +1,8 @@
|
||||
<Material MtlFlags="524288" Shader="Illum" GenMask="4001010000001" StringGenMask="%ALLOW_SILHOUETTE_POM%NORMAL_MAP%SPECULAR_MAP%SUBSURFACE_SCATTERING" SurfaceType="mat_concrete" Diffuse="0.51491767,0.51491767,0.51491767,1" Specular="0.001517635,0.001517635,0.001517635,1" Opacity="1" vertModifType="0" LayerAct="1">
|
||||
<Textures>
|
||||
<Texture Map="Diffuse" File="engineassets/texturemsg/defaultsolids_diff.dds"/>
|
||||
<Texture Map="Bumpmap" File="engineassets/texturemsg/defaultsolids_ddn.dds"/>
|
||||
<Texture Map="Specular" File="engineassets/texturemsg/defaultsolids_spec.dds"/>
|
||||
</Textures>
|
||||
<PublicParams EmittanceMapGamma="1" SSSIndex="0" IndirectColor="0.25,0.25,0.25"/>
|
||||
</Material>
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ab9a26b4a4b8b4df6bb715b918e1da5a9fcb9b8d55b5d59300f35a5aa1524604
|
||||
size 810472
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b07c594df091bcba9cb73cbf836643adcd0ebad5a38458584f62a9b1b47e41e
|
||||
size 793918
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=Uncompressed /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9d1efa9b4a4bf2c826777c1bf5f2a258b179eb6c1ac64f2abb0666f773d37039
|
||||
size 810444
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8f26330e140874de1643c3ded94b6b483ef48eede7f6f00ff7b394731a57f400
|
||||
size 182830
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b6ba0c05656f79dcdaa5b27a643a8617eb13b506bd19fbcc6b6d8212713045b8
|
||||
size 53670
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4137a407abce4fc68ccc7e186257364177e1fdaf1fd17703a4740f54fc70de0e
|
||||
size 53668
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2749c2aa22d0864743b4b454938ec6d69bf812698e08f63bd490b407a437e9d0
|
||||
size 299472
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:57aabaa778f8f754c8d25daebeb5d27d25c4f1359668f713107af0f8e425d695
|
||||
size 53694
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5b4eb4033e2759c2738dedfec4a99eba316f29af31c9cf963232a907a678fd51
|
||||
size 70100
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8f7b61e52df58dec940df92a021c8fb33aad85bed8184403872620b1208568c7
|
||||
size 50467
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /mipmaps=0 /preset=Diffuse_highQ /reduce=-1
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bfe4844d90e5659245c22742c323332c19bb3ffff14f7d09c4efe902b4427f4d
|
||||
size 181770
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c3db1ee5ca4dc4fb29c8072833eeac60ecec967d53a299b0e2e2933d4af946af
|
||||
size 69030
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:36e916d3b5d4625fc78cf9c36ce5d12b8b676635baf07fef7c53ed154223e6de
|
||||
size 53866
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /dns=1 /preset=Bump2Normalmap_highQ /reduce=0 /ser=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b83bbaa7a94202b9314f1d4c4ace4a8d0e6cc176cac1a7a1d8e223cc285499f0
|
||||
size 299454
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7cdc6612d476d7013ac3209efdb15f33202b91b5ceb191285722501b1e9dce74
|
||||
size 53666
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=Normalmap_highQ /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5e13819b05cb55abad806d3a1ce200a801bf42f86c51e28fb78478944fc1f9af
|
||||
size 70062
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=NormalmapWithGlossInAlpha_highQ /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:44c90e668c659fa48d21a104c8556b8e40af07bf977076cb104c8ccddec117a5
|
||||
size 53668
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /dns=1 /preset=Diffuse_lowQ /reduce=0 /ser=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:227999171ec57ac074d2bceb949a75bb96d1c1276ca4d925f39799c2275b9d0b
|
||||
size 299460
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /dns=1 /preset=EnvironmentProbeHDR /reduce=0 /ser=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bb0e9c6d1dc4851d06605876cc9abda2fb24323acea94190059ac78ddc4799ee
|
||||
size 3586
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=Diffuse_lowQ /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c8b00659e3d718cab216073d780819a79294b3e13376b30a332ba188f386e2be
|
||||
size 50616
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /dns=1 /preset=Diffuse_lowQ /reduce=0 /ser=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7d5f77281d5cd2819011171f6b1b1e22357f1cfe1c44678237b103b0bab5b982
|
||||
size 50616
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /dns=1 /preset=Diffuse_lowQ /reduce=0 /ser=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:93028743fba595e586eff6ef960cdd7bf928329930f05e1d2d4717e697e0c8f9
|
||||
size 53670
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c24db9d91faedad981ab373f1ec8f9737310f56b69a450b04b20560a40eb4915
|
||||
size 53862
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=Opacity /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b59034f263dc988ffd904cc4bb8e43192c8ee07cd17f109e4f7afe8589ae371a
|
||||
size 299446
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9e1c5aee7fb4f600c112b15e4abce667be8acd0f24c2251e0a6b52d82c79c00d
|
||||
size 53676
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=Normalmap_highQ /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:11c35a276c494a289734bcd98e8dc08d2a141827b574349c64eadc0e577b5353
|
||||
size 70072
|
||||
@@ -0,0 +1 @@
|
||||
/autooptimizefile=0 /preset=NormalmapWithGlossInAlpha_highQ /reduce=0
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:22c0c29e3f3e35c8933b0759eb527fee366634f624971c79075f4b16fd91419c
|
||||
size 3538
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b550cc5e03a79150b03a65c0d151e2760f941af3acd24ef5128f80bba3f98ff5
|
||||
size 3536
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:597ca43034cf330e1ebac3eeb5a4131e6844378c73ed541864280ce15a721dc2
|
||||
size 3538
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cb312fc852bfa7cb70817d6b21fbd82c3e8a65b4afed4b39613a3b4d3e7222c5
|
||||
size 3536
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a54d9825737381e9bc091c58457c7d130b0d93e23e856d03c3f8f7fa132da639
|
||||
size 3536
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:06954a7449a60d6b0671634ae8ae8886c993d040ec26df4bef4967dcd3d3d9b4
|
||||
size 3540
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5ca7dbd42dc1d68a6c3d45f5cc79bdf7cd67678b0d999ad40ac2f61a31b37bbc
|
||||
size 3538
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:443d42f6d4b5fe288a1ea05c6c3e455ec05c510a2b29fae1a5b7cb0e4645aa8f
|
||||
size 3536
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1465b842db8dfad5838068b6a993dace78aeb740a458bfdd8a2e82d408d16d40
|
||||
size 3538
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8e6a94114b07c23157298553c808610ecca867c3bd3f4db8f8c9a920e7463309
|
||||
size 3538
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:79ce630d5559f9b28ded476de84583311f439db69b55d3fa5b175ba78a6abb18
|
||||
size 3546
|
||||
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:75d21a62e73a5515ce264f8788d2d307924ccc873db90cca78b3925dce702583
|
||||
size 3538
|
||||
Reference in New Issue
Block a user