Browse Source

ATOM-15691 Remove/Replace Sample Env, Update ASV tests (#95)

- Removed some unused files
- Switched ShaderSample use an existing ibl texture instead of the licensed one.

ATOM-15608 ASV AP are processing screenshot images which increase the asset processing time for nothing
- Updated ASV's AssetProcessorGamePlatformConfig.setreg file to exclude screenshots folder

Others
- Updated some screenshots for PassTree.
- Added a missing screenshot for StandPBR
Qing Tao 4 năm trước cách đây
mục cha
commit
d5403933d8

+ 3 - 4
AssetProcessorGamePlatformConfig.setreg

@@ -8,14 +8,13 @@
                 "RC fbx": {
                     "ignore": true
                 },
-                "RC ppm": {
-                    "glob": "*.ppm",
-                    "params": "copy"
-                },
                 "ScanFolder AtomTestData": {
                     "watch": "@ENGINEROOT@/Gems/Atom/TestData",
                     "recursive": 1,
                     "order": 1000
+                },
+                "Exclude screenshots": {
+                    "pattern": ".*\\\\/Scripts\\\\/ExpectedScreenshots\\\\/.*"
                 }
             }
         }

+ 1 - 1
Gem/Code/Source/ShadingExampleComponent.cpp

@@ -68,7 +68,7 @@ namespace AtomSampleViewer
 
         // Load default IBL texture asset for LuxCore
         // We should be able to extract this information from SkyBox in the future
-        LoadIBLImage("textures/sampleenvironment/papermill_e_3k.exr.streamingimage");
+        LoadIBLImage("textures/sampleenvironment/example_iblskyboxcm.dds.streamingimage");
 
         AZ::Render::LuxCoreRequestsBus::Broadcast(&AZ::Render::LuxCoreRequestsBus::Events::SetCameraEntityID, GetCameraEntityId());
         AzFramework::InputChannelEventListener::Connect();

+ 2 - 2
Scripts/ExpectedScreenshots/PassTree/depthStencilMs.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f7d958c15444047511aabd1c6238352a5a52dd8c7544d1c3d5c1760df794d08
-size 177429
+oid sha256:51802ee9065d9e7a14ef89c02de48cf791f2f7109040eeeaf075152b1046bbdb
+size 200425

+ 2 - 2
Scripts/ExpectedScreenshots/PassTree/depthStencilResolve.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9185124ed37143e03c4413600e5b863c67db8268a5bc871d4afb32fc7db5a400
-size 177547
+oid sha256:51802ee9065d9e7a14ef89c02de48cf791f2f7109040eeeaf075152b1046bbdb
+size 200425

+ 3 - 0
Scripts/ExpectedScreenshots/StandardPBR/009_opacity_tintedtransparent.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16d1730f26c3b6346fd005c51541a4b0348372dbddb10d0505343912290f4208
+size 954936

+ 0 - 3
Textures/SampleEnvironment/PaperMill_E_3k.exr

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc9981393c88c6d30a0a5a6837e6f6246a9f550042b3c4be39dd34e479b90569
-size 16793931

+ 0 - 69
Textures/SampleEnvironment/PaperMill_E_3k.exr.assetinfo

@@ -1,69 +0,0 @@
-<ObjectStream version="3">
-	<Class name="TextureSettings" version="1" type="{980132FF-C450-425D-8AE0-BD96A8486177}">
-		<Class name="AZ::Uuid" field="PresetID" value="{46D9F30F-793C-4449-BCEF-12A396E61B2C}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-		<Class name="unsigned int" field="SizeReduceLevel" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="bool" field="EngineReduce" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="EnableMipmap" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="bool" field="MaintainAlphaCoverage" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		<Class name="AZStd::vector" field="MipMapAlphaAdjustments" type="{3349AACD-BE04-50BC-9478-528BF2ACFD55}">
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-			<Class name="unsigned int" field="element" value="50" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		</Class>
-		<Class name="unsigned int" field="MipMapGenEval" value="0" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
-		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
-			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="ios" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
-						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
-						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#1·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
-						</Class>
-						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-							<Class name="AddressType" field="value1" value="AZStd::map({74E4843B-0924-583D-8C6E-A37B09BD51FE})::PlatformSpecificOverrides·0/AZStd::pair({CAC4E67F-D626-5452-A057-ACB57D53F549})#0·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}"/>
-						</Class>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="pc" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
-					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-					<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
-				</Class>
-			</Class>
-		</Class>
-		<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-	</Class>
-</ObjectStream>
-

+ 0 - 3
Textures/SampleEnvironment/environmentprobeday_cm.tif

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f32f72cbe6564436ec7298b61fc01beb32d1d4caee681af6c07e370862e217c7
-size 3148003

+ 0 - 3
Textures/SampleEnvironment/exampleBrdf_lut.dds

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:440bcb1579d4ad667c040bda914ed3121980526a94f23879a0c482c799fd5132
-size 1310848

+ 0 - 3
Textures/SampleEnvironment/exampleDiffuseHDR_cm.dds

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf4b22481726214c062ac27fb2d9d8a49e760a76d8fff03330ff9c5f9275a8da
-size 1966208

+ 0 - 10
Textures/SampleEnvironment/papermill_license.txt

@@ -1,10 +0,0 @@
-The papermill 'Image base lighting' (IBL) images are modified from the following:
-
-http://www.hdrlabs.com/sibl/archive.html
-'Papermill Ruins E'
-
-All sIBL-sets on this page, including the images within, are licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License.
-
-Creative Commons License: http://creativecommons.org/licenses/by-nc-sa/3.0/us/
-
-Remember: Do what you want with them, but always mention where you got them from...

+ 0 - 7
Textures/YokohamaCube.license.txt

@@ -1,7 +0,0 @@
-This yokohamCube.dss is modified from the following source
-
-https://www.humus.name/index.php?page=Textures
-https://www.humus.name/index.php?page=Cubemap&item=Yokohama3
-
-These textures are licensed under a Creative Commons Attribution 3.0 Unported License.
-https://creativecommons.org/licenses/by/3.0/

+ 0 - 3
Textures/YokohamaCube_cm.dds

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b4396be9db653ebee8283607fe8e633183f4948ff1cba8f78eac7321777004a
-size 100663424