sascha/cool-retro-term
1
0
Fork 0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-11-01 15:42:12 +00:00
Code Issues Releases Wiki Activity

Revert "Add subpixels rasterization and improve existing ones."

Browse Source 
Use something similar to what we had before, avoiding heavy texture
fetches."

This reverts commit 293b05fec6.
This commit is contained in:
Filippo Scognamiglio
2018-11-13 21:57:50 +01:00
parent 9df470acfc
commit 4e123d747a
4 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/qml/ShaderTerminal.qml
View File

@@ -27,7 +27,6 @@ ShaderEffect {
property ShaderEffectSource source
property BurnInEffect burnInEffect
property ShaderEffectSource bloomSource
property ShaderEffectSource rasterizationSource
property color fontColor: appSettings.fontColor
property color backgroundColor: appSettings.backgroundColor
@@ -66,6 +65,10 @@ ShaderEffect {
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 dispY
property size virtual_resolution
@@ -170,12 +173,10 @@ ShaderEffect {
uniform lowp float screen_brightness;
uniform highp vec2 virtual_resolution;
uniform highp vec2 rasterizationSmooth;
uniform highp float dispX;
uniform highp float dispY;" +
(rasterization != appSettings.no_rasterization ?
"uniform lowp sampler2D rasterizationSource;" : "") +
(bloom !== 0 ? "
uniform highp sampler2D bloomSource;
uniform lowp float bloom;" : "") +
@@ -219,7 +220,24 @@ ShaderEffect {
return fract(smoothstep(-120.0, 0.0, coords.y - (virtual_resolution.y + 120.0) * fract(time * 0.00015)));
}" : "") +
"float min2(vec2 v) {
"highp float getScanlineIntensity(vec2 coords) {
highp float result = 1.0;" +
(appSettings.rasterization != appSettings.no_rasterization ?
"float val = 0.0;
val += smoothstep(0.0, 0.5, fract(coords.y * virtual_resolution.y));
val -= smoothstep(0.5, 1.0, fract(coords.y * virtual_resolution.y));
result *= mix(val, 1.0, rasterizationSmooth.y);" : "") +
(appSettings.rasterization == appSettings.pixel_rasterization ?
"val = 0.0;
val += smoothstep(0.0, 0.5, fract(coords.x * virtual_resolution.x));
val -= smoothstep(0.5, 1.0, fract(coords.x * virtual_resolution.x));
result *= mix(val, 1.0, rasterizationSmooth.x);" : "") + "
return result;
}
float min2(vec2 v) {
return min(v.x, v.y);
}
@@ -310,10 +328,7 @@ ShaderEffect {
:
"vec3 finalColor = mix(backgroundColor.rgb, fontColor.rgb, greyscale_color);") +
(rasterization != appSettings.no_rasterization ? "
finalColor *= 2.0;
finalColor *= texture2D(rasterizationSource, staticCoords * (virtual_resolution)).rgb;
" : "") +
"finalColor *= getScanlineIntensity(coords);" +
(bloom !== 0 ?
"vec4 bloomFullColor = texture2D(bloomSource, coords);