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

Merge pull request #54 from Azaezel/alpha40CompilerCorrection

Browse source 
shader compiler correction
This commit is contained in:
Areloch 2019-05-30 23:57:42 -05:00 • committed by GitHub
commit 732f76b576
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/rendering/shaders/gl/brdf.glsl
View file

@ -58,8 +58,8 @@ vec3 FresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness)
float Fr_DisneyDiffuse(float NdotV, float NdotL, float LdotH, float linearRoughness) float Fr_DisneyDiffuse(float NdotV, float NdotL, float LdotH, float linearRoughness)
{ {
float energyBias = lerp(0, 0.5, linearRoughness); float energyBias = lerp(0.0f, 0.5f, linearRoughness);
float energyFactor = lerp(1.0, 1.0 / 1.51, linearRoughness); float energyFactor = lerp(1.0f, 1.0f / 1.51f, linearRoughness);
float fd90 = energyBias + 2.0 * LdotH*LdotH * linearRoughness; float fd90 = energyBias + 2.0 * LdotH*LdotH * linearRoughness;
vec3 f0 = vec3(1.0f, 1.0f, 1.0f); vec3 f0 = vec3(1.0f, 1.0f, 1.0f);
float lightScatter = F_Schlick(f0, fd90, NdotL).r; float lightScatter = F_Schlick(f0, fd90, NdotL).r;

2
Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
View file

@ -115,7 +115,7 @@ void updateSurface(inout Surface surface)
surface.NdotV = abs(dot(surface.N, surface.V)) + 1e-5f; // avoid artifact surface.NdotV = abs(dot(surface.N, surface.V)) + 1e-5f; // avoid artifact
surface.albedo = surface.baseColor.rgb * (1.0 - surface.metalness); surface.albedo = surface.baseColor.rgb * (1.0 - surface.metalness);
surface.f0 = lerp(vec3(0.04), surface.baseColor.rgb, surface.metalness); surface.f0 = lerp(vec3(0.04f), surface.baseColor.rgb, surface.metalness);
surface.R = -reflect(surface.V, surface.N); surface.R = -reflect(surface.V, surface.N);
float f90 = saturate(50.0 * dot(surface.f0, vec3(0.33,0.33,0.33))); float f90 = saturate(50.0 * dot(surface.f0, vec3(0.33,0.33,0.33)));
surface.F = F_Schlick(surface.f0, f90, surface.NdotV); surface.F = F_Schlick(surface.f0, f90, surface.NdotV);