ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update with more probable values

Browse Source
This commit is contained in:
samuncle 2019-03-10 23:46:18 +01:00
parent 476b73375a
commit be577df2ec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/shaders/combine_diffuse_color.frag
View File

@ -20,7 +20,7 @@ void main()
// Polish map is stored in normal color framebuffer .z
// Metallic map is stored in normal color framebuffer .w
// Emit map is stored in diffuse color framebuffer.w
float metallicMapValue = 0.0; //texture(normal_color, tc).w;
float metallicMapValue = texture(normal_color, tc).w;
float emitMapValue = diffuseMatColor.w;
float ao = texture(ssao_tex, tc).x;
@ -28,7 +28,7 @@ void main()
vec3 SpecularComponent = texture(specular_map, tc).xyz;
vec3 diffuse_color_for_mix = diffuseMatColor.xyz * 4.0;
vec3 metallicMatColor = mix(vec3(0.5), diffuse_color_for_mix, metallicMapValue);
vec3 metallicMatColor = mix(vec3(0.2), diffuse_color_for_mix, metallicMapValue);
vec3 tmp = DiffuseComponent * mix(diffuseMatColor.xyz, vec3(0.0), metallicMapValue) + (metallicMatColor * SpecularComponent);
vec3 emitCol = diffuseMatColor.xyz + (diffuseMatColor.xyz * diffuseMatColor.xyz * emitMapValue * emitMapValue * 10.0);

2
data/shaders/sp_solid.frag
View File

@ -39,7 +39,7 @@ void main(void)
o_normal_color.xy = 0.5 * EncodeNormal(normalize(normal)) + 0.5;
o_normal_color.zw = layer_2.xy;
o_normal_color.z = 0.1;
//o_normal_color.z = 0;
#else
o_diffuse_color = vec4(final_color, 1.0);
#endif