eaws: update gray overlay

Author: joerg-christian

gl_engine/shaders/eaws.frag

@@ -113,7 +113,6 @@ void main() {
     highp uint eawsRegionId = texelFetch(texture_sampler, ivec3(int(uv.x * float(512)), int(uv.y * float(512)) , texture_layer_f), 0).r;
     ivec4 report = eaws.reports[eawsRegionId];
     vec3 eaws_color = color_no_report_available;
-    highp float mix_factor = 0.9; // Mix factor between eaws color and photo texture
 
     // // debug output regions
     //eaws_color = vec3(float((eawsRegionId >> 8u) & 255u) / 256.0, float(eawsRegionId & 255u) / 256.0, float((eawsRegionId >> 16u) & 255u) / 256.0);
@@ -128,12 +127,9 @@ void main() {
     {
         // assign a color to slope angle obtained from (not normalized) normal
         eaws_color = slopeAngleColorFromNormal(fragNormal);
-        mix_factor = 0.5;
     }
-    else if(report.x >= 0) // avalanche report is available. report.x = -1 would mean no report available since .x stores the exposition as described in the  Masters THesis of Joey which must be >=0
+    else if(report.x >= 0) // avalanche report is available. report.x = < 0 would mean no report available since .x stores the exposition as described in the  Masters THesis of Joey which must be >0
     {
-        mix_factor = 0.5;
-
         // get avalanche ratings for eaws region of current fragment
         int bound = report.y;      // bound dividing moutain in Hi region and low region
         int ratingHi = report.a;   // rating should be value in {0,1,2,3,4}
@@ -192,7 +188,9 @@ void main() {
 
     // merge photo texture with eaws color
     if(eaws_color.r > 0.0 || eaws_color.g > 0.0 || eaws_color.b > 0.0)
-        texout_albedo = mix(terrain_color, eaws_color, mix_factor);
+        texout_albedo = mix(terrain_color, eaws_color, 0.5);
+    else if(eaws_color.r < 0.0 ) // no report available or danger rating = 0: grey
+        texout_albedo = mix(terrain_color, vec3(0.5,0.5,0.5), 0.9);
     else
         texout_albedo = terrain_color;
 }

gl_engine/shaders/eaws.glsl

@@ -26,11 +26,10 @@ layout (std140) uniform eaws_reports {
 } eaws;
 
 // Color for areas where no report is available
-vec3 color_no_report_available = vec3(0.5,0.5,0.5);
+vec3 color_no_report_available = vec3(-1.0,-1.0,-1.0);
 
 vec3 color_from_eaws_danger_rating(int rating)
 {
-    if(0 == rating) return vec3(0.0,0.0,0.0);      // no color     for 0 = no snow
     if(1 == rating) return vec3(0.0,1.0,0.0);      // green        for 1 = low
     if(2 == rating) return vec3(1.0,1.0,0.0);      // yellow       for 2 = moderate
     if(3 == rating) return vec3(1.0,0.53f,0.0);    // orange       for 3 = considerable
@@ -113,6 +112,7 @@ vec3 color_from_snowCard_risk_parameters(int eaws_danger_rating, vec3 notNormali
         // pick unfavorable array according to eaws danger rating
         switch(eaws_danger_rating)
         {
+            case 0: return color_no_report_available;
             case 1: return (1.0-a) * snowCardLevel[unfavorable1[idx]] + a * snowCardLevel[unfavorable1[nextIdx]];
             case 2: return (1.0-a) * snowCardLevel[unfavorable2[idx]] + a * snowCardLevel[unfavorable2[nextIdx]];
             case 3: return (1.0-a) * snowCardLevel[unfavorable3[idx]] + a * snowCardLevel[unfavorable3[nextIdx]];
@@ -125,6 +125,7 @@ vec3 color_from_snowCard_risk_parameters(int eaws_danger_rating, vec3 notNormali
         // pick favorable array according to eaws danger rating
         switch(eaws_danger_rating)
         {
+            case 0: return color_no_report_available;
             case 1: return (1.0-a) * snowCardLevel[favorable1[idx]] + a * snowCardLevel[favorable1[nextIdx]];
             case 2: return (1.0-a) * snowCardLevel[favorable2[idx]] + a * snowCardLevel[favorable2[nextIdx]];
             case 3: return (1.0-a) * snowCardLevel[favorable3[idx]] + a * snowCardLevel[favorable3[nextIdx]];
@@ -143,7 +144,7 @@ bool goOver40[5] = bool[5](true, false, false, false, false);
 vec3 color_from_stop_or_go(vec3 notNormalizedNormal, int eaws_danger_rating)
 {
     // danger rating must be in [1,5]
-    if(eaws_danger_rating < 1 || 5 < eaws_danger_rating) return vec3(0.0,0.0,0.0);
+    if(eaws_danger_rating < 1 || 5 < eaws_danger_rating) return color_no_report_available;
     int idx = eaws_danger_rating -1;
 
     // Calculte slope angle