fly/fgdata
1
0
Fork 0
Code Activity

HDR: Fix model-combined objects without normal maps

Browse source
This commit is contained in:
Fernando García Liñán 2021-08-25 15:16:38 +02:00
parent aaf6bb9309
commit beb4381ad1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Shaders/HDR/geometry-combined.frag
View file

@ -14,7 +14,7 @@ uniform int normalmap_dds;
uniform float normalmap_tiling; uniform float normalmap_tiling;
const float DEFAULT_COMBINED_METALNESS = 0.0; const float DEFAULT_COMBINED_METALNESS = 0.0;
const float DEFAULT_COMBINED_ROUGHNESS = 0.2; const float DEFAULT_COMBINED_ROUGHNESS = 0.1;
vec2 encodeNormal(vec3 n); vec2 encodeNormal(vec3 n);
vec3 decodeSRGB(vec3 screenRGB); vec3 decodeSRGB(vec3 screenRGB);
@ -24,7 +24,7 @@ void main()
gbuffer0.rgb = decodeSRGB(texture(color_tex, texCoord).rgb); gbuffer0.rgb = decodeSRGB(texture(color_tex, texCoord).rgb);
gbuffer0.a = 1.0; gbuffer0.a = 1.0;
vec3 normal = vec3(0.5, 0.5, 1.0); vec3 normal = vec3(0.0, 0.0, 1.0);
if (normalmap_enabled > 0) { if (normalmap_enabled > 0) {
normal = texture(normal_tex, texCoord * normalmap_tiling).rgb * 2.0 - 1.0; normal = texture(normal_tex, texCoord * normalmap_tiling).rgb * 2.0 - 1.0;
// DDS has flipped normals // DDS has flipped normals