eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 12:49:18 +02:00
Code Issues 123 Wiki Activity

shader fix

Browse Source
This commit is contained in:
milek7
2018-10-17 21:54:03 +02:00
parent b9fbe7452b
commit 455ca1cacf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/light_common.glsl
View File

@@ -38,7 +38,7 @@ vec3 apply_fog(vec3 color)
vec2 calc_light(vec3 light_dir) vec2 calc_light(vec3 light_dir)
{ {
#ifdef NORMALMAP #ifdef NORMALMAP
vec3 normal = f_tbn * normalize(texture(normalmap, f_coord).rgb * 2.0 - 1.0); vec3 normal = normalize(f_tbn * normalize(texture(normalmap, f_coord).rgb * 2.0 - 1.0));
#else #else
vec3 normal = normalize(f_normal); vec3 normal = normalize(f_normal);
#endif #endif

2
shaders/mat_normalmap.frag
View File

@@ -44,7 +44,7 @@ void main()
if (tex_color.a < opacity) if (tex_color.a < opacity)
discard; discard;
vec3 normal = f_tbn * normalize(texture(normalmap, f_coord).rgb * 2.0 - 1.0); vec3 normal = normalize(f_tbn * normalize(texture(normalmap, f_coord).rgb * 2.0 - 1.0));
vec3 refvec = reflect(f_pos.xyz, normal); vec3 refvec = reflect(f_pos.xyz, normal);
#if ENVMAP_ENABLED #if ENVMAP_ENABLED
vec3 envcolor = texture(envmap, refvec).rgb; vec3 envcolor = texture(envmap, refvec).rgb;