From 38d4c5dd527a5d9549810572ac914a94485d38a7 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Mon, 15 Dec 2014 22:18:22 +0100 Subject: [PATCH] Fix: Improve a bit and fix visual issues with bloom. --- app/qml/ShaderTerminal.qml | 11 +++++------ qmltermwidget | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/qml/ShaderTerminal.qml b/app/qml/ShaderTerminal.qml index 562b5b0..5bb59a0 100644 --- a/app/qml/ShaderTerminal.qml +++ b/app/qml/ShaderTerminal.qml @@ -284,16 +284,12 @@ ShaderEffect { : "vec3 finalColor = mix(background_color.rgb, font_color.rgb, greyscale_color);") + - "finalColor *= getScanlineIntensity(coords); - finalColor *= smoothstep(-dispX, 0.0, coords.x) - smoothstep(1.0, 1.0 + dispX, coords.x); - finalColor *= smoothstep(-dispY, 0.0, coords.y) - smoothstep(1.0, 1.0 + dispY, coords.y);" + + "finalColor *= getScanlineIntensity(coords);" + (bloom_strength !== 0 ? "vec4 bloomFullColor = texture2D(bloomSource, coords); vec3 bloomColor = bloomFullColor.rgb; - vec2 minBound = step(vec2(0.0), coords); - vec2 maxBound = step(coords, vec2(1.0)); - float bloomAlpha = bloomFullColor.a * minBound.x * minBound.y * maxBound.x * maxBound.y;" + + float bloomAlpha = bloomFullColor.a;" + (chroma_color !== 0 ? "bloomColor = font_color.rgb * mix(vec3(rgb2grey(bloomColor)), bloomColor, chroma_color);" : @@ -301,6 +297,9 @@ ShaderEffect { "finalColor += bloomColor * bloom_strength * bloomAlpha;" : "") + + "finalColor *= smoothstep(-dispX, 0.0, coords.x) - smoothstep(1.0, 1.0 + dispX, coords.x); + finalColor *= smoothstep(-dispY, 0.0, coords.y) - smoothstep(1.0, 1.0 + dispY, coords.y);" + + (brightness_flickering !== 0 ? " finalColor *= brightness;" : "") + diff --git a/qmltermwidget b/qmltermwidget index fb04792..b003cff 160000 --- a/qmltermwidget +++ b/qmltermwidget @@ -1 +1 @@ -Subproject commit fb04792ae3dfbbc40a8d957a7b7300a98862bb9d +Subproject commit b003cff04f5891abe15086e946a0630e66efb242