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 #1393 from Azaezel/alpha41/mangledMetal

Browse source 
correct high metallic objects lacking color input
This commit is contained in:
Brian Roberts 2025-02-25 02:46:13 -06:00 committed by GitHub
parent 9f3785d893 34bc015d3e
commit e7dfcc1fe3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,7 +226,7 @@ float getDistanceAtt( vec3 unormalizedLightVector , float invSqrAttRadius )
vec3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
{
//diffuse term
vec3 Fd = surface.albedo.rgb * surface.ao * M_1OVER_PI_F;
vec3 Fd = surface.albedo.rgb * M_1OVER_PI_F;
//GGX specular
vec3 F = F_Schlick(surface.f0, surface.f90, surfaceToLight.HdotV);
@ -237,7 +237,7 @@ vec3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
if(isCapturing == 1)
return mix(Fd + Fr, surface.baseColor.rgb, surface.metalness);
else
return Fd + Fr;
return Fd + Fr + surface.f0 * surface.ao;
}
vec3 getDirectionalLight(Surface surface, SurfaceToLight surfaceToLight, vec3 lightColor, float lightIntensity, float shadow)

4
Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
View file

@ -227,7 +227,7 @@ float getDistanceAtt( float3 unormalizedLightVector , float invSqrAttRadius )
float3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
{
//diffuse term
float3 Fd = surface.albedo.rgb * surface.ao * M_1OVER_PI_F;
float3 Fd = surface.albedo.rgb * M_1OVER_PI_F;
//GGX specular
float3 F = F_Schlick(surface.f0, surface.f90, surfaceToLight.HdotV);
@ -238,7 +238,7 @@ float3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
if(isCapturing == 1)
return lerp(Fd + Fr,surface.baseColor.rgb,surface.metalness);
else
return Fd + Fr;
return Fd + Fr + surface.f0 * surface.ao;
}
float3 getDirectionalLight(Surface surface, SurfaceToLight surfaceToLight, float3 lightColor, float lightIntensity, float shadow)