summaryrefslogtreecommitdiff
path: root/client/shaders/liquids_shader/opengl_fragment.glsl
diff options
context:
space:
mode:
Diffstat (limited to 'client/shaders/liquids_shader/opengl_fragment.glsl')
-rw-r--r--client/shaders/liquids_shader/opengl_fragment.glsl15
1 files changed, 6 insertions, 9 deletions
diff --git a/client/shaders/liquids_shader/opengl_fragment.glsl b/client/shaders/liquids_shader/opengl_fragment.glsl
index b9156d06e..cab8d8e01 100644
--- a/client/shaders/liquids_shader/opengl_fragment.glsl
+++ b/client/shaders/liquids_shader/opengl_fragment.glsl
@@ -1,11 +1,7 @@
-#version 120
-
uniform sampler2D baseTexture;
uniform sampler2D normalTexture;
uniform sampler2D useNormalmap;
-uniform float enableBumpmapping;
-
uniform vec4 skyBgColor;
uniform float fogDistance;
uniform vec3 eyePosition;
@@ -19,12 +15,13 @@ void main (void)
{
vec3 color;
vec2 uv = gl_TexCoord[0].st;
-
-#ifdef NORMALS
+
+#ifdef USE_NORMALMAPS
float use_normalmap = texture2D(useNormalmap,vec2(1.0,1.0)).r;
- float enable_bumpmapping = enableBumpmapping;
+#endif
- if ((enable_bumpmapping == 1.0) && (use_normalmap > 0.0)) {
+#ifdef ENABLE_BUMPMAPPING
+ if (use_normalmap > 0.0) {
vec3 base = texture2D(baseTexture, uv).rgb;
vec3 vVec = normalize(eyeVec);
vec3 bump = normalize(texture2D(normalTexture, uv).xyz * 2.0 - 1.0);
@@ -53,5 +50,5 @@ void main (void)
float d = max(0.0, min(vPosition.z / fogDistance * 1.5 - 0.6, 1.0));
alpha = mix(alpha, 0.0, d);
}
- gl_FragColor = vec4(col.r, col.g, col.b, alpha);
+ gl_FragColor = vec4(col.r, col.g, col.b, alpha);
}