changeset 1406:5e4a2ea8219b

Minor simplification of default fragment shader
author Michael Pavone <pavone@retrodev.com>
date Sat, 17 Jun 2017 17:43:47 -0700
parents ee19270495e8
children 4c58695c1e1f
files shaders/default.f.glsl
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 	);
 }