# HG changeset patch # User Michael Pavone # Date 1497746627 25200 # Node ID 5e4a2ea8219bdedee89c1361730e9ab3f3bbaaf7 # Parent ee19270495e8dff8aa75402bbc7f37a14ed29ecc Minor simplification of default fragment shader diff -r ee19270495e8 -r 5e4a2ea8219b shaders/default.f.glsl --- a/shaders/default.f.glsl Sat Jun 17 15:56:07 2017 -0700 +++ b/shaders/default.f.glsl Sat Jun 17 17:43:47 2017 -0700 @@ -8,8 +8,8 @@ { vec2 modifiedCoord = vec2(texcoord.x, (floor(texcoord.y * 512.0) + 0.5)/512.0); gl_FragColor = mix( + texture2D(textures[1], modifiedCoord), texture2D(textures[0], modifiedCoord), - texture2D(textures[1], modifiedCoord), - (sin((texcoord.y * 1024.0 + 1.0)* 3.14159265359) + 1.0) * 0.5 + (sin(texcoord.y * 1024.0 * 3.14159265359) + 1.0) * 0.5 ); }