sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-11-04 09:02:14 +00:00
Code Issues Releases Wiki Activity

Scanlines no longer affect background. Less artifacts at low fontSize values.

Browse Source
This commit is contained in:
Filippo Scognamiglio
2018-11-18 19:10:52 +01:00
parent 6f04513faa
commit de8602847e
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/qml/ShaderTerminal.qml
View File

@@ -65,10 +65,6 @@ ShaderEffect {
property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness) property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness)
property size rasterizationSmooth: Qt.size(
Utils.clamp(2.0 * virtual_resolution.width / (width * devicePixelRatio), 0.0, 1.0),
Utils.clamp(2.0 * virtual_resolution.height / (height * devicePixelRatio), 0.0, 1.0))
property real dispX property real dispX
property real dispY property real dispY
property size virtual_resolution property size virtual_resolution
@@ -173,7 +169,6 @@ ShaderEffect {
uniform lowp float screen_brightness; uniform lowp float screen_brightness;
uniform highp vec2 virtual_resolution; uniform highp vec2 virtual_resolution;
uniform highp vec2 rasterizationSmooth;
uniform highp float dispX; uniform highp float dispX;
uniform highp float dispY;" + uniform highp float dispY;" +
@@ -221,18 +216,19 @@ ShaderEffect {
}" : "") + }" : "") +
"highp float getScanlineIntensity(vec2 coords) { "highp float getScanlineIntensity(vec2 coords) {
highp float result = 1.0;" + float result = 1.0;" +
(appSettings.rasterization != appSettings.no_rasterization ? (appSettings.rasterization != appSettings.no_rasterization ?
"float val = 0.0; "float val = 0.0;
val += smoothstep(0.0, 0.5, fract(coords.y * virtual_resolution.y)); vec2 rasterizationCoords = fract(coords * virtual_resolution);
val -= smoothstep(0.5, 1.0, fract(coords.y * virtual_resolution.y)); val += smoothstep(0.0, 0.5, rasterizationCoords.y);
result *= mix(val, 1.0, rasterizationSmooth.y);" : "") + val -= smoothstep(0.5, 1.0, rasterizationCoords.y);
result *= mix(0.5, 1.0, val);" : "") +
(appSettings.rasterization == appSettings.pixel_rasterization ? (appSettings.rasterization == appSettings.pixel_rasterization ?
"val = 0.0; "val = 0.0;
val += smoothstep(0.0, 0.5, fract(coords.x * virtual_resolution.x)); val += smoothstep(0.0, 0.5, rasterizationCoords.x);
val -= smoothstep(0.5, 1.0, fract(coords.x * virtual_resolution.x)); val -= smoothstep(0.5, 1.0, rasterizationCoords.x);
result *= mix(val, 1.0, rasterizationSmooth.x);" : "") + " result *= mix(0.5, 1.0, val);" : "") + "
return result; return result;
} }
@@ -319,6 +315,8 @@ ShaderEffect {
txt_color = max(txt_color, 0.5 * (txt_blur.rgb - vec3(blurDecay)));" txt_color = max(txt_color, 0.5 * (txt_blur.rgb - vec3(blurDecay)));"
: "") + : "") +
"txt_color *= getScanlineIntensity(coords);" +
"txt_color += fontColor.rgb * color;" + "txt_color += fontColor.rgb * color;" +
"float greyscale_color = rgb2grey(txt_color);" + "float greyscale_color = rgb2grey(txt_color);" +
@@ -328,8 +326,6 @@ ShaderEffect {
: :
"vec3 finalColor = mix(backgroundColor.rgb, fontColor.rgb, greyscale_color);") + "vec3 finalColor = mix(backgroundColor.rgb, fontColor.rgb, greyscale_color);") +
"finalColor *= getScanlineIntensity(coords);" +
(bloom !== 0 ? (bloom !== 0 ?
"vec4 bloomFullColor = texture2D(bloomSource, coords); "vec4 bloomFullColor = texture2D(bloomSource, coords);
vec3 bloomColor = bloomFullColor.rgb; vec3 bloomColor = bloomFullColor.rgb;