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

…colors." This reverts commit 3cee186.
Swordfish90 · Dec 18, 2018 · c85eba6 · c85eba6
1 parent dcb7b7c
commit c85eba6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/qml/BurnInEffect.qml b/app/qml/BurnInEffect.qml
@@ -108,8 +108,8 @@ Loader {
 
                  uniform highp float prevLastUpdate;" +
 
-                "float max3(vec3 v) {
-                    return max(v.x, max(v.y, v.z));
+                "float rgb2grey(vec3 v){
+                    return dot(v, vec3(0.21, 0.72, 0.04));
                 }" +
 
                 "void main() {
@@ -119,7 +119,7 @@ Loader {
                     vec4 accColor = texture2D(burnInSource, coords);
 
                     float prevMask = accColor.a;
-                    float currMask = max3(txtColor);
+                    float currMask = rgb2grey(txtColor);
 
                     highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
                     blurDecay = max(0.0, blurDecay - prevMask);