From 2b2ae66b8d57228205c07a7b885ff2cd23d7b8b5 Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Fri, 9 Nov 2018 21:06:13 +0100 Subject: [PATCH] Fix small issue with burnin masking. --- app/qml/BurnInEffect.qml | 11 +++++------ app/qml/ShaderTerminal.qml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/qml/BurnInEffect.qml b/app/qml/BurnInEffect.qml index 17fb20d..8400132 100644 --- a/app/qml/BurnInEffect.qml +++ b/app/qml/BurnInEffect.qml @@ -73,7 +73,7 @@ Loader { Connections { target: kterminalScrollbar - onOpacityChanged: burnInEffect.restartBlurSource() + onOpacityChanged: completelyUpdate() } } @@ -118,13 +118,12 @@ Loader { vec4 accColor = texture2D(burnInSource, coords); float prevMask = accColor.a; - float currMask = 1.0 - max3(txtColor); + float currMask = max3(txtColor); - highp float blurDecay = prevMask * clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0); + highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0); + blurDecay = max(0.0, blurDecay - prevMask); vec3 blurColor = accColor.rgb - vec3(blurDecay); - - blurColor = clamp(blurColor, vec3(0.0), vec3(1.0)); - vec3 color = max(blurColor, txtColor * 0.5); + vec3 color = max(blurColor, txtColor); gl_FragColor = vec4(color, currMask); } diff --git a/app/qml/ShaderTerminal.qml b/app/qml/ShaderTerminal.qml index d4a775b..0f01f07 100644 --- a/app/qml/ShaderTerminal.qml +++ b/app/qml/ShaderTerminal.qml @@ -298,7 +298,7 @@ ShaderEffect { (burnIn !== 0 ? " vec4 txt_blur = texture2D(burnInSource, txt_coords); float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0); - txt_color = max(txt_color, txt_blur.rgb - vec3(blurDecay));" + txt_color = max(txt_color, 0.5 * (txt_blur.rgb - vec3(blurDecay)));" : "") + "txt_color += fontColor.rgb * color;" +