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

use a nonlinear reflectionopacity curve, and the greater of metalness or reflectionopacity for ibl overtaking albedo

Browse source
This commit is contained in:
AzaezelX 2025-12-14 02:29:31 -06:00
parent fad8e12667
commit 2199fb6881
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -592,9 +592,11 @@ vec4 computeForwardProbes(Surface surface,
specular = mix(specular,textureLod(specularCubemapAR, vec4(surface.R, skylightCubemapIdx), lod).xyz, alpha);
}
float reflectionOpacity = clamp(surface.baseColor.a, pow(max(length(specular),length(irradiance)),2.2),1.0);
float reflectionInfluence = max(surface.metalness, reflectionOpacity);
vec2 envBRDF = textureLod(BRDFTexture, vec2(surface.NdotV, surface.roughness),0).rg;
vec3 diffuse = irradiance * lerp(surface.baseColor.rgb, vec3(0.04f,0.04f,0.04f), surface.metalness);
vec3 specularCol = ((specular * surface.baseColor.rgb) * envBRDF.x + envBRDF.y)*surface.metalness;
vec3 diffuse = irradiance * lerp(surface.baseColor.rgb, vec3(0.04f,0.04f,0.04f), reflectionInfluence);
vec3 specularCol = ((specular * surface.baseColor.rgb) * envBRDF.x + envBRDF.y)*reflectionInfluence;
float horizonOcclusion = 1.3;
float horizon = saturate( 1 + horizonOcclusion * dot(surface.R, surface.N));
@ -608,8 +610,7 @@ vec4 computeForwardProbes(Surface surface,
return vec4(lerp((finalColor), surface.baseColor.rgb,surface.metalness),surface.baseColor.a);
else
{
float reflectionOpacity = min(max(surface.baseColor.a,length(specular+irradiance)),1.0);
return vec4(finalColor, reflectionOpacity);
return vec4(finalColor, reflectionInfluence);
}
}

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

@ -597,24 +597,25 @@ float4 computeForwardProbes(Surface surface,
specular = lerp(specular,TORQUE_TEXCUBEARRAYLOD(specularCubemapAR, surface.R, skylightCubemapIdx, lod).xyz,alpha);
}
float reflectionOpacity = clamp(surface.baseColor.a, pow(max(length(specular),length(irradiance)),2.2),1.0);
float reflectionInfluence = max(surface.metalness, reflectionOpacity);
float2 envBRDF = TORQUE_TEX2DLOD(BRDFTexture, float4(surface.NdotV, surface.roughness,0,0)).rg;
float3 diffuse = irradiance * lerp(surface.baseColor.rgb, 0.04f, surface.metalness);
float3 specularCol = ((specular * surface.baseColor.rgb) * envBRDF.x + envBRDF.y)*surface.metalness;
float3 diffuse = irradiance * lerp(surface.baseColor.rgb, 0.04f, reflectionInfluence);
float3 specularCol = ((specular * surface.baseColor.rgb) * envBRDF.x + envBRDF.y)*reflectionInfluence;
float horizonOcclusion = 1.3;
float horizon = saturate( 1 + horizonOcclusion * dot(surface.R, surface.N));
horizon *= horizon;
// Final color output after environment lighting
float3 finalColor = diffuse + specularCol;
float3 finalColor = diffuse + specularCol* horizon;
finalColor *= surface.ao;
if(isCapturing == 1)
return float4(lerp((finalColor), surface.baseColor.rgb,surface.metalness),surface.baseColor.a);
return float4(lerp((finalColor), surface.baseColor.rgb, surface.metalness),surface.baseColor.a);
else
{
float reflectionOpacity = min(max(surface.baseColor.a,length(specular+irradiance)),1.0);
return float4(finalColor, reflectionOpacity);
return float4(finalColor, reflectionInfluence);
}
}