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

Fix small issue with burnin masking.

Browse Source
This commit is contained in:
Filippo Scognamiglio 2018-11-09 21:06:13 +01:00
parent 0a95c5dff3
commit 2b2ae66b8d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/qml/BurnInEffect.qml
View File

@ -73,7 +73,7 @@ Loader {
Connections { Connections {
target: kterminalScrollbar target: kterminalScrollbar
onOpacityChanged: burnInEffect.restartBlurSource() onOpacityChanged: completelyUpdate()
} }
} }
@ -118,13 +118,12 @@ Loader {
vec4 accColor = texture2D(burnInSource, coords); vec4 accColor = texture2D(burnInSource, coords);
float prevMask = accColor.a; 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); vec3 blurColor = accColor.rgb - vec3(blurDecay);
vec3 color = max(blurColor, txtColor);
blurColor = clamp(blurColor, vec3(0.0), vec3(1.0));
vec3 color = max(blurColor, txtColor * 0.5);
gl_FragColor = vec4(color, currMask); gl_FragColor = vec4(color, currMask);
} }

2
app/qml/ShaderTerminal.qml
View File

@ -298,7 +298,7 @@ ShaderEffect {
(burnIn !== 0 ? " (burnIn !== 0 ? "
vec4 txt_blur = texture2D(burnInSource, txt_coords); vec4 txt_blur = texture2D(burnInSource, txt_coords);
float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0); 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;" + "txt_color += fontColor.rgb * color;" +