From 5494a09eefa4b65a5c763becdd518215f7216aa9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 7 Apr 2020 12:46:32 +0200 Subject: [PATCH] Make sure warning works for greyscale colors. part of CURA-7262 --- resources/shaders/xray_composite.shader | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/resources/shaders/xray_composite.shader b/resources/shaders/xray_composite.shader index 4233067ec4..8a2f3aa6c4 100644 --- a/resources/shaders/xray_composite.shader +++ b/resources/shaders/xray_composite.shader @@ -43,6 +43,13 @@ fragment = vec3 shiftHue(vec3 color, float hue) { + // Make sure colors are distinct when grey-scale is used too: + if ((max(max(color.r, color.g), color.b) - min(min(color.r, color.g), color.b)) < 0.1) + { + color = vec3(1.0, 0.0, 0.0); + } + + // The actual hue shift: const vec3 k = vec3(0.57735, 0.57735, 0.57735); float cosAngle = cos(hue); return vec3(color * cosAngle + cross(k, color) * sin(hue) + k * dot(k, color) * (1.0 - cosAngle)); @@ -131,6 +138,13 @@ fragment41core = vec3 shiftHue(vec3 color, float hue) { + // Make sure colors are distinct when grey-scale is used too: + if ((max(max(color.r, color.g), color.b) - min(min(color.r, color.g), color.b)) < 0.1) + { + color = vec3(1.0, 0.0, 0.0); + } + + // The actual hue shift: const vec3 k = vec3(0.57735, 0.57735, 0.57735); float cosAngle = cos(hue); return vec3(color * cosAngle + cross(k, color) * sin(hue) + k * dot(k, color) * (1.0 - cosAngle));