diff options
| author | est31 <MTest31@outlook.com> | 2015-06-14 23:09:20 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-06-14 23:15:20 +0200 |
| commit | ee38bcd307e1a2e0e8b010956eff432329f3e8d8 (patch) | |
| tree | 28766078502e59836ea0748ffe3fa0d6dbf14e6f /client/shaders/water_surface_shader/opengl_vertex.glsl | |
| parent | 43fcfbfe05578d7471d40c8c087fd04e24b264b5 (diff) | |
| download | minetest-ee38bcd307e1a2e0e8b010956eff432329f3e8d8.tar.gz minetest-ee38bcd307e1a2e0e8b010956eff432329f3e8d8.tar.bz2 minetest-ee38bcd307e1a2e0e8b010956eff432329f3e8d8.zip | |
Automated whitespace error fix for last commit
Diffstat (limited to 'client/shaders/water_surface_shader/opengl_vertex.glsl')
| -rw-r--r-- | client/shaders/water_surface_shader/opengl_vertex.glsl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/client/shaders/water_surface_shader/opengl_vertex.glsl b/client/shaders/water_surface_shader/opengl_vertex.glsl index 53678800d..7ae517d8a 100644 --- a/client/shaders/water_surface_shader/opengl_vertex.glsl +++ b/client/shaders/water_surface_shader/opengl_vertex.glsl @@ -18,23 +18,23 @@ varying vec3 tsLightVec; const float e = 2.718281828459;
const float BS = 10.0;
-float smoothCurve(float x)
-{
- return x * x * (3.0 - 2.0 * x);
+float smoothCurve(float x) +{ + return x * x * (3.0 - 2.0 * x); }
-float triangleWave(float x)
-{
- return abs(fract( x + 0.5 ) * 2.0 - 1.0);
+float triangleWave(float x) +{ + return abs(fract( x + 0.5 ) * 2.0 - 1.0); }
-float smoothTriangleWave(float x)
-{
- return smoothCurve(triangleWave( x )) * 2.0 - 1.0;
+float smoothTriangleWave(float x) +{ + return smoothCurve(triangleWave( x )) * 2.0 - 1.0; }
void main(void)
{
gl_TexCoord[0] = gl_MultiTexCoord0;
-
+ #if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER
vec4 pos = gl_Vertex;
pos.y -= 2.0;
|