Merge branch 'develop' into feature/radar-smoothing

This commit is contained in:
Dan Paulat 2024-12-14 06:57:24 -06:00
commit 82ea0dacd3
6 changed files with 157 additions and 6 deletions

View file

@ -21,7 +21,9 @@ smooth out vec4 color;
void main()
{
if (gsIn[0].displayed != 0 &&
(gsIn[0].threshold <= 0 || // If Threshold: 0 was specified, no threshold
(gsIn[0].threshold == 0 || // If Threshold: 0 was specified, no threshold
uMapDistance == 0 || // If uMapDistance is zero, threshold is disabled
(gsIn[0].threshold < 0 && -(gsIn[0].threshold) <= uMapDistance) || // If Threshold is negative and below current map distance
gsIn[0].threshold >= uMapDistance || // If Threshold is above current map distance
gsIn[0].threshold >= 999) && // If Threshold: 999 was specified (or greater), no threshold
(gsIn[0].timeRange[0] == 0 || // If there is no start time specified