eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "param_glossiness" missing from final gloss formula in materials utilising gloss maps.

Browse Source
This commit is contained in:
stele
2020-07-16 18:05:37 +02:00
parent 532d5f8b69
commit c4945d3f32
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/mat_default_specgloss.frag
View File

@@ -42,7 +42,7 @@ void main()
vec3 fragnormal = normalize(f_normal);
float reflectivity = param[1].z;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone);

2
shaders/mat_normalmap_specgloss.frag
View File

@@ -52,7 +52,7 @@ void main()
vec3 fragnormal = normalize(f_tbn * normalize(normal.xyz));
float reflectivity = param[1].z * texture(normalmap, f_coord).a;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone);

2
shaders/mat_parallax_specgloss.frag
View File

@@ -60,7 +60,7 @@ void main()
vec3 fragnormal = normalize(f_tbn * normalize(normal.xyz));
float reflectivity = param[1].z * texture(normalmap, f_coord_p).a;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone);

2
shaders/mat_reflmap_specgloss.frag
View File

@@ -46,7 +46,7 @@ void main()
vec3 fragnormal = normalize(f_normal);
float reflectivity = param[1].z * texture(reflmap, f_coord).a;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone);

2
shaders/mat_shadowlessnormalmap_specgloss.frag
View File

@@ -52,7 +52,7 @@ void main()
vec3 fragnormal = normalize(f_tbn * normalize(normal.xyz));
float reflectivity = param[1].z * texture(normalmap, f_coord).a;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, 1.0);

2
shaders/mat_sunlessnormalmap_specgloss.frag
View File

@@ -95,7 +95,7 @@ void main()
vec3 fragnormal = normalize(f_tbn * normalize(normal.xyz));
float reflectivity = param[1].z * texture(normalmap, f_coord).a;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights_sunless(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone);

2
shaders/mat_water_specgloss.frag
View File

@@ -63,7 +63,7 @@ void main()
vec3 fragnormal = normalize(f_tbn * normalize(normal.xyz));
float reflectivity = param[1].z * texture(normalmap, texture_coords ).a;
float specularity = texture(specgloss, f_coord).r;
glossiness = texture(specgloss, f_coord).g * 8;
glossiness = texture(specgloss, f_coord).g * abs(param[1].w);
metalic = (texture(specgloss, f_coord).b > 0.5) ? true : false;
fragcolor = apply_lights(fragcolor, fragnormal, tex_color.rgb, reflectivity, specularity, shadow_tone);