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

undefined preprocessors on some machines eval to true. given this is purely a bool anyway, might as well stick to ifdef

Browse source
This commit is contained in:
AzaezelX 2020-11-13 15:19:50 -06:00
parent 2d18d5b280
commit c0b6007b9f
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,10 +219,10 @@ vec3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
float D = D_GGX(surfaceToLight.NdotH, surface.linearRoughnessSq); float D = D_GGX(surfaceToLight.NdotH, surface.linearRoughnessSq);
vec3 Fr = D * F * Vis; vec3 Fr = D * F * Vis;
#if CAPTURING == true #ifdef CAPTURING
return mix(Fd + Fr,surface.f0,surface.metalness); return saturate(mix(Fd + Fr,surface.f0,surface.metalness));
#else #else
return Fd + Fr; return saturate(Fd + Fr);
#endif #endif
} }

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

@ -220,10 +220,10 @@ float3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
float D = D_GGX(surfaceToLight.NdotH, surface.linearRoughnessSq); float D = D_GGX(surfaceToLight.NdotH, surface.linearRoughnessSq);
float3 Fr = D * F * Vis; float3 Fr = D * F * Vis;
#if CAPTURING == true #ifdef CAPTURING
return lerp(Fd + Fr,surface.f0,surface.metalness); return saturate(lerp(Fd + Fr,surface.f0,surface.metalness));
#else #else
return Fd + Fr; return saturate(Fd + Fr);
#endif #endif
} }