Merge pull request #121 from aws-lumberyard-dev/santorac/stabilization/2106/HotReloadFixes

Added a new material hot reload test case for a specific issue ATOM-14613

ATOM-14613 Baseviewer MatertialHotReloadTest fails to change the color after turning blending on and off
https://github.com/aws-lumberyard/o3de/pull/1385

Scripts/ExpectedScreenshots/MaterialHotReloadTest/15_Red_AfterShaderReload.png

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

Scripts/MaterialHotReloadTest.bv.lua

@@ -22,13 +22,37 @@ ResizeViewport(500, 500)
 
 SelectImageComparisonToleranceLevel("Level E")
 
+function SetColorRed()
+    AssetTracking_Start()
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.material")
+    SetImguiValue('ColorA = Red', true)
+    AssetTracking_IdleUntilExpectedAssetsFinish(5)
+    IdleSeconds(0.25) -- Idle for a bit to give time for the asset to reload
+end
+
+function SetBlendingOn()
+    AssetTracking_Start()
+    SetImguiValue('Blending On', true)
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.material")
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.materialtype")
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.shader")
+    AssetTracking_IdleUntilExpectedAssetsFinish(60)
+    IdleSeconds(1) -- Idle for a bit to give time for the assets to reload
+end
+
+function SetBlendingOff()
+    AssetTracking_Start()
+    SetImguiValue('Blending Off', true)
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.material")
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.materialtype")
+    AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.shader")
+    AssetTracking_IdleUntilExpectedAssetsFinish(60)
+    IdleSeconds(1) -- Idle for a bit to give time for the assets to reload
+end
+
 CaptureScreenshot(g_screenshotOutputFolder .. '/01_Default.png')
 
-AssetTracking_Start()
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.material")
-SetImguiValue('ColorA = Red', true)
-AssetTracking_IdleUntilExpectedAssetsFinish(5)
-IdleSeconds(0.25) -- Idle for a bit to give time for the asset to reload
+SetColorRed()
 CaptureScreenshot(g_screenshotOutputFolder .. '/02_Red.png')
 
 AssetTracking_Start()
@@ -62,13 +86,7 @@ AssetTracking_IdleUntilExpectedAssetsFinish(60)
 IdleSeconds(1) -- Idle for a bit to give time for the assets to reload
 CaptureScreenshot(g_screenshotOutputFolder .. '/06_VerticalPattern.png')
 
-AssetTracking_Start()
-SetImguiValue('Blending On', true)
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.material")
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.materialtype")
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.shader")
-AssetTracking_IdleUntilExpectedAssetsFinish(60)
-IdleSeconds(1) -- Idle for a bit to give time for the assets to reload
+SetBlendingOn()
 CaptureScreenshot(g_screenshotOutputFolder .. '/07_BlendingOn.png')
 
 -- This will switch to showing the "Shader Variant: Fully Baked" message
@@ -105,13 +123,7 @@ CaptureScreenshot(g_screenshotOutputFolder .. '/11_Variants_None.png')
 -- Now, changing the .shader file will force the shader to reload and will not find
 -- any baked variants, since we switched to "None" above, and so this screenshot will 
 -- switch back to showing the "Shader Variant: Root" message.
-AssetTracking_Start()
-SetImguiValue('Blending Off', true)
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.material")
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.materialtype")
-AssetTracking_ExpectAsset(g_assetFolder .. "HotReloadTest.shader")
-AssetTracking_IdleUntilExpectedAssetsFinish(60)
-IdleSeconds(1) -- Idle for a bit to give time for the assets to reload
+SetBlendingOff()
 --[GFX TODO] This test is consistently failing due to an Asset Processor bug. Re-enable this test once that is fixed.
 --CaptureScreenshot(g_screenshotOutputFolder .. '/12_Variants_None_AfterUpdatingShader.png')
 
@@ -138,4 +150,11 @@ AssetTracking_IdleUntilExpectedAssetsFinish(60)
 -- AssetTracking utility and the asset system triggering the reload. We should avoid increasing this if possible (but maybe we'll have no 
 -- choice ... we'll see)
 IdleSeconds(0.25) -- Idle for a bit to give time for the assets to reload
-CaptureScreenshot(g_screenshotOutputFolder .. '/14_HorizontalPattern.png')
+CaptureScreenshot(g_screenshotOutputFolder .. '/14_HorizontalPattern.png')
+
+-- Test a specific scenario that was failing, where color changes fail to reload after making a shader change.
+SetBlendingOn()
+SetBlendingOff()
+SetColorRed()
+CaptureScreenshot(g_screenshotOutputFolder .. '/15_Red_AfterShaderReload.png')
+