update crt-sines (#190)

* Update crt-sines.glsl Some improvements
libretro · May 1, 2023 · 70a3562 · 70a3562
1 parent a685f5a
commit 70a3562
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/crt/shaders/crt-sines.glsl b/crt/shaders/crt-sines.glsl
@@ -3,16 +3,16 @@
 // by DariusG @2023
 
 ///////////////////////  Runtime Parameters  ///////////////////////
-#pragma parameter SCANLINE1 "Scanline Brightness Dark" 0.3 0.0 1.0 0.05
-#pragma parameter SCANLINE2 "Scanline Brightness Bright" 0.5 0.0 1.0 0.05
+#pragma parameter SCANLINE1 "Scanline Brightness Dark" 0.1 0.0 1.0 0.05
+#pragma parameter SCANLINE2 "Scanline Brightness Bright" 0.75 0.0 1.0 0.05
 #pragma parameter INTERLACE "Interlace Mode" 1.0 0.0 1.0 1.0
 #pragma parameter SCALE "Scanlines downscale"  1.0 1.0 4.0 1.0
-#pragma parameter MSK1 "   Mask Brightness Dark" 0.4 0.0 1.0 0.05
-#pragma parameter MSK2 "   Mask Brightness Bright" 0.7 0.0 1.0 0.05
-#pragma parameter MSK_SIZE "   Mask Size, variable " 1.0 0.25 4.0 0.25
-#pragma parameter fade "   Mask/Scanlines Fade" 0.2 0.0 1.0 0.05
+#pragma parameter MSK1 "   Mask Brightness Dark" 0.25 0.0 1.0 0.05
+#pragma parameter MSK2 "   Mask Brightness Bright" 0.5 0.0 1.0 0.05
+#pragma parameter MSK_SIZE "   Mask Size " 2.0 0.25 2.0 0.25
+#pragma parameter fade "   Mask/Scanlines Fade" 0.3 0.0 1.0 0.05
 #pragma parameter BOOST "Bright Colors Boost" 1.00 1.0 1.5 0.02
-#pragma parameter PRESERVE "Protect Bright Colors" 0.6 0.0 1.0 0.01
+#pragma parameter PRESERVE "Protect Bright Colors" 0.4 0.0 1.0 0.01
 #pragma parameter WP "Color Temperature shift" 0.00 -0.25 0.25 0.01
 #pragma parameter GAMMA "Gamma Adjust" 1.0 0.0 1.2 0.01
 #pragma parameter sat "Saturation" 1.1 0.0 2.0 0.05
@@ -69,7 +69,7 @@ void main()
 {
     gl_Position = MVPMatrix * VertexCoord;
     TEX0.xy = TexCoord.xy*1.0001;
-    omega = vec2(pi * SourceSize.x*MSK_SIZE, pi * SourceSize.y/SCALE);
+    omega = vec2(pi * OutputSize.x*MSK_SIZE, pi * SourceSize.y/SCALE);
 }
 
 #elif defined(FRAGMENT)
@@ -168,22 +168,26 @@ void main()
           res+= InvX.w*c13.xyz;
 
     /////////////////////
-    vec3 lumweight=vec3(0.3,0.6,0.1);
+    vec3 lumweight=vec3(0.2126,0.7152,0.0722);
     float lum = dot(res,lumweight);
     //FAKE GAMMA
        if (GAMMA != 1.0)  {res *= mix(GAMMA, 1.0, lum);}
+
     //APPLY MASK 
          float MSK = mix(MSK1,MSK2,lum);       
          float mask = mix((1.0-MSK)*abs(sin(vTexCoord.x*omega.x))+MSK, 1.0, lum*PRESERVE);
 
          float scan = 1.0;
          float SCANLINE = mix(SCANLINE1,SCANLINE2,lum);
+
     //INTERLACING MODE FIX SCANLINES
     if (INTERLACE > 0.0 && InputSize.y > 400.0 ) scan; else
-         scan= (1.0 - SCANLINE)*abs(sin(vTexCoord.y* omega.y)) + SCANLINE+lum*0.1;
+         scan= (1.0 - SCANLINE)*abs(sin(vTexCoord.y* omega.y)) + SCANLINE;
          res *=mix(scan*mask, scan, dot(res, vec3(fade)));
+
     //BRIGHT BOOST
        if (BOOST != 1.0)  res *= mix(1.0,BOOST,lum);
+
     //CHEAP TEMPERATURE CONTROL     
        if (WP != 0.0) { res *= vec3(1.0+WP,1.0,1.0-WP);}
 

diff --git a/scanlines/shaders/scanline.glsl b/scanlines/shaders/scanline.glsl
@@ -1,5 +1,4 @@
 // Parameter lines go here:
-#pragma parameter SCANLINE_BASE_BRIGHTNESS "Scanline Base Brightness" 0.95 0.0 1.0 0.01
 #pragma parameter SCANLINE_SINE_COMP_A "Grid Strength" 0.0 0.0 1.00 0.02
 #pragma parameter SCANLINE_SINE_COMP_B "Scanline Strength" 0.25 0.0 1.0 0.05
 #pragma parameter size "Grid size"  1.0 1.0 2.0 1.0
@@ -43,8 +42,8 @@ void main()
 {
     gl_Position = MVPMatrix * VertexCoord;
     COL0 = COLOR;
-    TEX0.xy = TexCoord.xy;
-    omega = vec2(pi * size * OutputSize.x, 2.0 * pi * TextureSize.y);
+    TEX0.xy = TexCoord.xy*1.0001;
+    omega = vec2(pi * size * OutputSize.x, 1.999 * pi * TextureSize.y);
 }
 
 #elif defined(FRAGMENT)
@@ -88,11 +87,9 @@ COMPAT_VARYING vec2 omega;
 
 #ifdef PARAMETER_UNIFORM
 // All parameter floats need to have COMPAT_PRECISION in front of them
-uniform COMPAT_PRECISION float SCANLINE_BASE_BRIGHTNESS;
 uniform COMPAT_PRECISION float SCANLINE_SINE_COMP_A;
 uniform COMPAT_PRECISION float SCANLINE_SINE_COMP_B;
 #else
-#define SCANLINE_BASE_BRIGHTNESS 0.95
 #define SCANLINE_SINE_COMP_A 0.0
 #define SCANLINE_SINE_COMP_B 0.15
 #endif
@@ -101,7 +98,7 @@ void main()
 {
    vec2 sine_comp = vec2(SCANLINE_SINE_COMP_A, SCANLINE_SINE_COMP_B);
    vec3 res = COMPAT_TEXTURE(Source, vTexCoord).xyz;
-   vec3 scanline = res * (SCANLINE_BASE_BRIGHTNESS + dot(sine_comp * sin(vTexCoord * omega), vec2(1.0, 1.0)));
-   FragColor = vec4(scanline.x, scanline.y, scanline.z, 1.0);
+   vec3 scanline = res * ((1.0-SCANLINE_SINE_COMP_B*0.5) + dot(sine_comp * sin(vTexCoord * omega), vec2(1.0, 1.0)));
+   FragColor = vec4(scanline, 1.0);
 } 
 #endif