Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

This commit is contained in:
Jaime van Kessel 2022-01-03 15:32:58 +01:00
commit f11d728c6b
838 changed files with 99530 additions and 92324 deletions

View file

@ -1,4 +1,4 @@
# Copyright (c) 2020 Ultimaker B.V.
# Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from UM.Math.Color import Color

View file

@ -56,12 +56,12 @@ vertex41core =
value = (abs_value - min_value) / (max_value - min_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)
{
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);
}
@ -76,7 +76,7 @@ vertex41core =
{
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);
if (value > 0.75)
{
@ -98,18 +98,18 @@ vertex41core =
value = (abs_value - min_value) / (max_value - min_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)
{
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);
}
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;
}

View file

@ -2,7 +2,7 @@
"name": "Simulation View",
"author": "Ultimaker B.V.",
"version": "1.0.1",
"description": "Provides the Simulation view.",
"description": "Provides the preview of sliced layerdata.",
"api": 7,
"i18n-catalog": "cura"
}