TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reset ligtht outputs to output color*shadowing as oposed to baking shadowing into the alpha chan now that we're ignoring that for lights specifically (though we're still keeping the alpha chan arround for varying-IBL input blending purposes

Browse source
This commit is contained in:
Azaezel 2018-10-24 20:55:48 -05:00
parent a5cad08ba6
commit 8538337a36
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/Full/game/shaders/common/lighting/advanced/gl/pointLightP.glsl
View file

@ -269,6 +269,6 @@ void main()
if (nDotL<0) shadowed = 0; if (nDotL<0) shadowed = 0;
float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness;
//output //output
OUT_col = float4(diffuse * lightBrightness, Sat_NL_Att*shadowed); OUT_col = float4(diffuse * lightBrightness*Sat_NL_Att*shadowed,1.0);
OUT_col1 = float4(specular * lightBrightness, Sat_NL_Att*shadowed); OUT_col1 = float4(specular * lightBrightness*Sat_NL_Att*shadowed,1.0);
} }

4
Templates/Full/game/shaders/common/lighting/advanced/gl/spotLightP.glsl
View file

@ -207,6 +207,6 @@ void main()
if (nDotL<0) shadowed = 0; if (nDotL<0) shadowed = 0;
float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness;
//output //output
OUT_col = float4(diffuse * lightBrightness, Sat_NL_Att*shadowed); OUT_col = float4(diffuse * lightBrightness*Sat_NL_Att*shadowed,1.0);
OUT_col1 = float4(specular * lightBrightness, Sat_NL_Att*shadowed); OUT_col1 = float4(specular * lightBrightness*Sat_NL_Att*shadowed,1.0);
} }

4
Templates/Full/game/shaders/common/lighting/advanced/gl/vectorLightP.glsl
View file

@ -307,6 +307,6 @@ void main()
float finalShadowed = shadowed; float finalShadowed = shadowed;
//output //output
OUT_col = float4(diffuse * (lightBrightness), dotNLa*shadowed); OUT_col = float4(diffuse * (lightBrightness)*dotNLa*shadowed,1.0);
OUT_col1 = float4(specular * (lightBrightness), dotNLa*shadowed); OUT_col1 = float4(specular * (lightBrightness)*dotNLa*shadowed,1.0);
} }

4
Templates/Full/game/shaders/common/lighting/advanced/pointLightP.hlsl
View file

@ -281,8 +281,8 @@ PS_OUTPUT main(ConvexConnectP IN)
if (nDotL<0) shadowed = 0; if (nDotL<0) shadowed = 0;
float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness;
//output //output
Output.diffuse = float4(diffuse * lightBrightness, Sat_NL_Att*shadowed); Output.diffuse = float4(diffuse * lightBrightness*Sat_NL_Att*shadowed,1.0);
Output.spec = float4(specular * lightBrightness, Sat_NL_Att*shadowed); Output.spec = float4(specular * lightBrightness*Sat_NL_Att*shadowed,1.0);
return Output; return Output;
} }

4
Templates/Full/game/shaders/common/lighting/advanced/spotLightP.hlsl
View file

@ -211,8 +211,8 @@ PS_OUTPUT main( ConvexConnectP IN )
if (nDotL<0) shadowed = 0; if (nDotL<0) shadowed = 0;
float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness; float Sat_NL_Att = saturate( nDotL * shadowed ) * lightBrightness;
//output //output
Output.diffuse = float4(diffuse * lightBrightness, Sat_NL_Att*shadowed); Output.diffuse = float4(diffuse * lightBrightness*Sat_NL_Att*shadowed,1.0);
Output.spec = float4(specular * lightBrightness, Sat_NL_Att*shadowed); Output.spec = float4(specular * lightBrightness*Sat_NL_Att*shadowed,1.0);
return Output; return Output;
} }

4
Templates/Full/game/shaders/common/lighting/advanced/vectorLightP.hlsl
View file

@ -318,8 +318,8 @@ PS_OUTPUT main(FarFrustumQuadConnectP IN)
float finalShadowed = shadowed; float finalShadowed = shadowed;
//output //output
Output.diffuse = float4(diffuse * (lightBrightness), dotNLa*shadowed); Output.diffuse = float4(diffuse * (lightBrightness)*dotNLa*shadowed, 1.0);
Output.spec = float4(specular * (lightBrightness), dotNLa*shadowed); Output.spec = float4(specular * (lightBrightness)*dotNLa*shadowed, 1.0);
return Output; return Output;
} }