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

Revert "Change burnin masking function to max. Should preseve darker colors."

Browse Source 
This reverts commit 3cee1866634567c025c5ddd17a85272073ef514c.
This commit is contained in:
Filippo Scognamiglio 2018-12-18 23:03:52 +01:00
parent dcb7b7c309
commit c85eba617c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/qml/BurnInEffect.qml
View File

@ -108,8 +108,8 @@ Loader {
uniform highp float prevLastUpdate;" + uniform highp float prevLastUpdate;" +
"float max3(vec3 v) { "float rgb2grey(vec3 v){
return max(v.x, max(v.y, v.z)); return dot(v, vec3(0.21, 0.72, 0.04));
}" + }" +
"void main() { "void main() {
@ -119,7 +119,7 @@ Loader {
vec4 accColor = texture2D(burnInSource, coords); vec4 accColor = texture2D(burnInSource, coords);
float prevMask = accColor.a; float prevMask = accColor.a;
float currMask = max3(txtColor); float currMask = rgb2grey(txtColor);
highp float blurDecay = 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); blurDecay = max(0.0, blurDecay - prevMask);