From 41ed6da420c83ed676a53ff6a3023bc6960e51bd Mon Sep 17 00:00:00 2001 From: Parracodea <157658450+parracodea@users.noreply.github.com> Date: Mon, 8 Apr 2024 04:52:40 -0400 Subject: [PATCH] Increase contrast in Science colored bands (#2066) Use lighter version of Red, Green, Blue for better accessibility --- src/screenComponents/rawScannerDataRadarOverlay.cpp | 6 +++--- src/screenComponents/rawScannerDataRadarOverlay.h | 1 + src/screenComponents/signalQualityIndicator.cpp | 6 +++--- src/screenComponents/signalQualityIndicator.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/screenComponents/rawScannerDataRadarOverlay.cpp b/src/screenComponents/rawScannerDataRadarOverlay.cpp index 277f1e03b2..833afa4429 100644 --- a/src/screenComponents/rawScannerDataRadarOverlay.cpp +++ b/src/screenComponents/rawScannerDataRadarOverlay.cpp @@ -171,7 +171,7 @@ void RawScannerDataRadarOverlay::onDraw(sp::RenderTarget& renderer) a_b.push_back(a_b.front()); // Draw each band as a line. - renderer.drawLineBlendAdd(a_r, glm::u8vec4(255, 0, 0, 255)); - renderer.drawLineBlendAdd(a_g, glm::u8vec4(0, 255, 0, 255)); - renderer.drawLineBlendAdd(a_b, glm::u8vec4(0, 0, 255, 255)); + renderer.drawLineBlendAdd(a_r, glm::u8vec4(255, 45, 84, 255)); // red + renderer.drawLineBlendAdd(a_g, glm::u8vec4(65, 255, 81, 255)); // green + renderer.drawLineBlendAdd(a_b, glm::u8vec4(70, 120, 255, 255)); // blue } diff --git a/src/screenComponents/rawScannerDataRadarOverlay.h b/src/screenComponents/rawScannerDataRadarOverlay.h index 47164a6429..047a9a507b 100644 --- a/src/screenComponents/rawScannerDataRadarOverlay.h +++ b/src/screenComponents/rawScannerDataRadarOverlay.h @@ -5,6 +5,7 @@ class GuiRadarView; +// Class for drawing the Science Bands (red, green, blue) around the Radar for the Science Station class RawScannerDataRadarOverlay : public GuiElement { public: diff --git a/src/screenComponents/signalQualityIndicator.cpp b/src/screenComponents/signalQualityIndicator.cpp index f0917b16b8..b4d07a9803 100644 --- a/src/screenComponents/signalQualityIndicator.cpp +++ b/src/screenComponents/signalQualityIndicator.cpp @@ -45,7 +45,7 @@ void GuiSignalQualityIndicator::onDraw(sp::RenderTarget& renderer) f = (1.0f - noise[2]) * f + noise[2] * random(-1.0, 1.0); b.emplace_back(rect.position.x + 4.0f + n * 4, rect.position.y + rect.size.y / 2.0f + f * amp); } - renderer.drawLineBlendAdd(r, glm::u8vec4(255, 0, 0, 255)); - renderer.drawLineBlendAdd(g, glm::u8vec4(0, 255, 0, 255)); - renderer.drawLineBlendAdd(b, glm::u8vec4(0, 0, 255, 255)); + renderer.drawLineBlendAdd(r, glm::u8vec4(255, 45, 84, 255)); // red + renderer.drawLineBlendAdd(g, glm::u8vec4(65, 255, 81, 255)); // green + renderer.drawLineBlendAdd(b, glm::u8vec4(70, 120, 255, 255)); // blue } diff --git a/src/screenComponents/signalQualityIndicator.h b/src/screenComponents/signalQualityIndicator.h index 7f92b213ea..72a55c5f20 100644 --- a/src/screenComponents/signalQualityIndicator.h +++ b/src/screenComponents/signalQualityIndicator.h @@ -6,7 +6,7 @@ #include "gui/gui2_element.h" #include "timer.h" - +// Class for drawing bands in the Science Station's "Scanning" mini-game class GuiSignalQualityIndicator : public GuiElement { sp::SystemStopwatch clock;