From b204518344256aeb336c3aa23d6d38b758539f4c Mon Sep 17 00:00:00 2001 From: Azaezel Date: Mon, 5 Sep 2016 22:12:36 -0500 Subject: [PATCH] lightbuffer (aka birghtness and shadow) always comes last as a multiplier --- .../game/shaders/common/lighting/advanced/deferredShadingP.hlsl | 2 +- .../shaders/common/lighting/advanced/gl/deferredShadingP.glsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Templates/Full/game/shaders/common/lighting/advanced/deferredShadingP.hlsl b/Templates/Full/game/shaders/common/lighting/advanced/deferredShadingP.hlsl index c710656f8..992cde5cb 100644 --- a/Templates/Full/game/shaders/common/lighting/advanced/deferredShadingP.hlsl +++ b/Templates/Full/game/shaders/common/lighting/advanced/deferredShadingP.hlsl @@ -47,8 +47,8 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0 colorBuffer *= (1.0 - colorBuffer.a); } - colorBuffer *= float4(lightBuffer.rgb, 1.0); colorBuffer += float4(specular, specular, specular, 1.0); + colorBuffer *= float4(lightBuffer.rgb, 1.0); return hdrEncode( float4(colorBuffer.rgb, 1.0) ); } diff --git a/Templates/Full/game/shaders/common/lighting/advanced/gl/deferredShadingP.glsl b/Templates/Full/game/shaders/common/lighting/advanced/gl/deferredShadingP.glsl index 8af37ef0c..ae01125af 100644 --- a/Templates/Full/game/shaders/common/lighting/advanced/gl/deferredShadingP.glsl +++ b/Templates/Full/game/shaders/common/lighting/advanced/gl/deferredShadingP.glsl @@ -52,8 +52,8 @@ void main() colorBuffer *= (1.0 - colorBuffer.a); } - colorBuffer *= vec4(lightBuffer.rgb, 1.0); colorBuffer += vec4(specular, specular, specular, 1.0); + colorBuffer *= vec4(lightBuffer.rgb, 1.0); OUT_col = hdrEncode( vec4(colorBuffer.rgb, 1.0) ); }