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

if/ifdef fix

Browse Source
This commit is contained in:
milek7
2018-07-25 12:34:35 +02:00
parent da429650ab
commit 5dbd1c1772
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shaders/mat_normalmap.frag
View File

@@ -22,11 +22,11 @@ uniform sampler2D diffuse;
#texture (normalmap, 1, RGB)
uniform sampler2D normalmap;
#ifdef SHADOWMAP_ENABLED
#if SHADOWMAP_ENABLED
uniform sampler2DShadow shadowmap;
#endif
#ifdef ENVMAP_ENABLED
#if ENVMAP_ENABLED
uniform samplerCube envmap;
#endif
@@ -42,7 +42,7 @@ void main()
vec3 normal = f_tbn * normalize(texture(normalmap, f_coord).rgb * 2.0 - 1.0);
vec3 refvec = reflect(f_pos.xyz, normal);
#ifdef ENVMAP_ENABLED
#if ENVMAP_ENABLED
vec3 envcolor = texture(envmap, refvec).rgb;
#else
vec3 envcolor = vec3(0.5);
@@ -74,7 +74,7 @@ void main()
gl_FragData[0] = vec4(apply_fog(result * tex_color.rgb), tex_color.a);
#ifdef MOTIONBLUR_ENABLED
#if MOTIONBLUR_ENABLED
{
vec2 a = (f_clip_future_pos.xy / f_clip_future_pos.w) * 0.5 + 0.5;;
vec2 b = (f_clip_pos.xy / f_clip_pos.w) * 0.5 + 0.5;;