TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1762 from Azaezel/specularOrderOfOperations

Browse source 
lightbuffer (aka brightness and shadow) always comes last as a mul
This commit is contained in:
Anis 2016-09-17 21:30:02 +02:00 committed by GitHub
parent e7972bd6a9 b204518344
commit a1983af225
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Templates/Full/game/shaders/common/lighting/advanced/deferredShadingP.hlsl
View file

@ -47,8 +47,8 @@ float4 main( PFXVertToPix IN ) : TORQUE_TARGET0
colorBuffer *= (1.0 - colorBuffer.a); colorBuffer *= (1.0 - colorBuffer.a);
} }
colorBuffer *= float4(lightBuffer.rgb, 1.0);
colorBuffer += float4(specular, specular, specular, 1.0); colorBuffer += float4(specular, specular, specular, 1.0);
colorBuffer *= float4(lightBuffer.rgb, 1.0);
return hdrEncode( float4(colorBuffer.rgb, 1.0) ); return hdrEncode( float4(colorBuffer.rgb, 1.0) );
} }

2
Templates/Full/game/shaders/common/lighting/advanced/gl/deferredShadingP.glsl
View file

@ -52,8 +52,8 @@ void main()
colorBuffer *= (1.0 - colorBuffer.a); colorBuffer *= (1.0 - colorBuffer.a);
} }
colorBuffer *= vec4(lightBuffer.rgb, 1.0);
colorBuffer += vec4(specular, specular, specular, 1.0); colorBuffer += vec4(specular, specular, specular, 1.0);
colorBuffer *= vec4(lightBuffer.rgb, 1.0);
OUT_col = hdrEncode( vec4(colorBuffer.rgb, 1.0) ); OUT_col = hdrEncode( vec4(colorBuffer.rgb, 1.0) );
} }