shaders/final.fsh

@@ -4,6 +4,7 @@
 
 //#define aberration
 //#define hBlur
+//#define scanlines
 
 varying vec2 texcoord;
 
@@ -12,7 +13,6 @@ uniform float viewWidth;
 
 #include "/module/aberration.frag"
 #include "/module/horizontal_blur.frag"
-#include "/module/scanline.frag"
 
 void main() {
 	vec3 color;
@@ -26,8 +26,11 @@ void main() {
 		color.rb = aberrate().rb;
 	#endif
 
-	#if scanline > 0
-		color = scanlines(color);
+	#ifdef scanlines
+		if(mod(int(gl_FragCoord.y / (pixelSize * 2)), 2) == 0)
+			color.rgb *= 0.95;
+		else
+			color.rgb /= 0.95;
 	#endif
 
 	gl_FragData[0] = vec4(color, 1);

shaders/lang/en_US.lang

@@ -54,10 +54,7 @@ screen.SCREEN=Screen
 
 option.interlacing=Interlacing
 
-option.scanline=Scanlines
-value.scanline.0=Off
-value.scanline.1=Soft
-value.scanline.2=Hard
+option.scanlines=Scanlines
 
 option.aberration=Chromatic Aberration
 

shaders/module/scanline.frag

@@ -1,18 +0,0 @@
-
-#include "/var/scanline.glsl"
-
-#define scanline 0 // [0 1 2]
-
-vec3 scanlines(vec3 color) {
-	#if		scanline == SCANLINE_SOFT
-		if(mod(int(gl_FragCoord.y / pixelSize * 2), 2) == 0)
-			color.rgb *= 0.95;
-		else
-			color.rgb /= 0.95;
-	#elif	scanline == SCANLINE_HARD
-		if(mod(int(gl_FragCoord.y / pixelSize), 2) == 0)
-			color.rgb *= 0.5;
-	#endif
-	return color;
-}
-

shaders/shaders.properties

@@ -20,7 +20,7 @@ screen.COLOR.columns=3
 screen.COLOR=colorMode dithering <empty> colorDepth <empty> monoPalette hueBits satBits valBits
 
 #	screen effects
-screen.SCREEN=interlacing scanline aberration
+screen.SCREEN=interlacing scanlines aberration
 
 #	console effects
 screen.CONSOLE.columns=1

shaders/var/scanline.glsl

@@ -1,5 +0,0 @@
-
-#define SCANLINE_SOFT 1
-#define SCANLINE_HARD 2
-#define SCANLINE_STRETCH 3
-