Merge branch 'fieldOfView-fix_simulation_view_crash'

This commit is contained in:
Remco Burema 2021-11-23 09:28:20 +01:00
commit 1eaacacc6a
No known key found for this signature in database
GPG Key ID: 215C49431D43F98C

View File

@ -58,12 +58,12 @@ vertex41core =
value = (abs_value - min_value) / (max_value - min_value); value = (abs_value - min_value) / (max_value - min_value);
} }
float red = value; float red = value;
float green = 1-abs(1-4*value); float green = 1.0 - abs(1.0 - 4.0 * value);
if (value > 0.375) if (value > 0.375)
{ {
green = 0.5; green = 0.5;
} }
float blue = max(1-4*value, 0); float blue = max(1.0 - 4.0 * value, 0.0);
return vec4(red, green, blue, 1.0); return vec4(red, green, blue, 1.0);
} }
@ -78,7 +78,7 @@ vertex41core =
{ {
value = (abs_value - min_value) / (max_value - min_value); value = (abs_value - min_value) / (max_value - min_value);
} }
float red = min(max(4*value-2, 0), 1); float red = min(max(4.0 * value - 2.0, 0.0), 1.0);
float green = min(1.5*value, 0.75); float green = min(1.5*value, 0.75);
if (value > 0.75) if (value > 0.75)
{ {
@ -100,18 +100,18 @@ vertex41core =
value = (abs_value - min_value) / (max_value - min_value); value = (abs_value - min_value) / (max_value - min_value);
} }
float red = value; float red = value;
float green = 1 - abs(1 - 4 * value); float green = 1.0 - abs(1.0 - 4.0 * value);
if(value > 0.375) if(value > 0.375)
{ {
green = 0.5; green = 0.5;
} }
float blue = max(1 - 4 * value, 0); float blue = max(1.0 - 4.0 * value, 0.0);
return vec4(red, green, blue, 1.0); return vec4(red, green, blue, 1.0);
} }
float clamp(float v) float clamp(float v)
{ {
float t = v < 0 ? 0 : v; float t = v < 0.0 ? 0.0 : v;
return t > 1.0 ? 1.0 : t; return t > 1.0 ? 1.0 : t;
} }