From 25d854fe12724a946036a43881db7801c5e39b90 Mon Sep 17 00:00:00 2001
From: Th3V1kt0r <98119869+Th3V1kt0r@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:07:53 +0200
Subject: [PATCH] Diffuse/specular parameters are mixed incorrectly. Or not?

---
 Samples/Media/Hlms/Pbs/Any/AmbientLighting_piece_ps.any   | 4 ++--
 Samples/Media/Hlms/Pbs/GLSLES/PixelShader_ps.glsl         | 8 ++++----
 Samples/Media/Hlms/Terra/Any/800.PixelShader_piece_ps.any | 8 ++++----
 Samples/Media/Hlms/Terra/GLSLES/PixelShader_ps.glsl       | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Samples/Media/Hlms/Pbs/Any/AmbientLighting_piece_ps.any b/Samples/Media/Hlms/Pbs/Any/AmbientLighting_piece_ps.any
index d7c8e1d0b28..496faef0781 100644
--- a/Samples/Media/Hlms/Pbs/Any/AmbientLighting_piece_ps.any
+++ b/Samples/Media/Hlms/Pbs/Any/AmbientLighting_piece_ps.any
@@ -78,9 +78,9 @@
 			{
 		@end
 				pixelData.envColourS += lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
-											  midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWD );
-				pixelData.envColourD += lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
 											  midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWS );
+				pixelData.envColourD += lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
+											  midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWD );
 		@property( vct_num_probes )
 			}
 		@end
diff --git a/Samples/Media/Hlms/Pbs/GLSLES/PixelShader_ps.glsl b/Samples/Media/Hlms/Pbs/GLSLES/PixelShader_ps.glsl
index 33e412daa97..f79bbc74edc 100644
--- a/Samples/Media/Hlms/Pbs/GLSLES/PixelShader_ps.glsl
+++ b/Samples/Media/Hlms/Pbs/GLSLES/PixelShader_ps.glsl
@@ -494,11 +494,11 @@ void main()
 		float ambientWS = dot( passBuf.ambientHemisphereDir.xyz, reflDir ) * 0.5 + 0.5;
 
 		@property( use_envprobe_map || hlms_use_ssr || use_planar_reflections )
-			envColourS	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
-			envColourD	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			envColourS	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			envColourD	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
 		@end @property( !use_envprobe_map && !hlms_use_ssr && !use_planar_reflections )
-			vec3 envColourS = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
-			vec3 envColourD = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			vec3 envColourS = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			vec3 envColourD = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
 		@end
 	@end
 
diff --git a/Samples/Media/Hlms/Terra/Any/800.PixelShader_piece_ps.any b/Samples/Media/Hlms/Terra/Any/800.PixelShader_piece_ps.any
index ff5b8419ca1..1347376d4cc 100644
--- a/Samples/Media/Hlms/Terra/Any/800.PixelShader_piece_ps.any
+++ b/Samples/Media/Hlms/Terra/Any/800.PixelShader_piece_ps.any
@@ -374,17 +374,17 @@
 					{
 				@end
 						pixelData.envColourS += lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
-													  midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWD );
-						pixelData.envColourD += lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
 													  midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWS );
+						pixelData.envColourD += lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
+													  midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWD );
 				@property( vct_num_probes )
 					}
 				@end
 			@else
 				pixelData.envColourS = lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
-											 midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWD );
-				pixelData.envColourD = lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
 											 midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWS );
+				pixelData.envColourD = lerp( midf3_c( passBuf.ambientLowerHemi.xyz ),
+											 midf3_c( passBuf.ambientUpperHemi.xyz ), ambientWD );
 			@end
 		@end
 		@property( ambient_fixed && vct_num_probes )
diff --git a/Samples/Media/Hlms/Terra/GLSLES/PixelShader_ps.glsl b/Samples/Media/Hlms/Terra/GLSLES/PixelShader_ps.glsl
index a3068015869..1753db3a129 100644
--- a/Samples/Media/Hlms/Terra/GLSLES/PixelShader_ps.glsl
+++ b/Samples/Media/Hlms/Terra/GLSLES/PixelShader_ps.glsl
@@ -299,11 +299,11 @@ void main()
 		float ambientWS = dot( passBuf.ambientHemisphereDir.xyz, reflDir ) * 0.5 + 0.5;
 
 		@property( envprobe_map )
-			envColourS	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
-			envColourD	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			envColourS	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			envColourD	+= mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
 		@end @property( !envprobe_map )
-			vec3 envColourS = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
-			vec3 envColourD = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			vec3 envColourS = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWS );
+			vec3 envColourD = mix( passBuf.ambientLowerHemi.xyz, passBuf.ambientUpperHemi.xyz, ambientWD );
 		@end
 	@end