From eb2624aaa6a58c6b248caf76c28c688c286c0f40 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Fri, 13 Dec 2024 15:48:37 +0100 Subject: [PATCH] Updates --- include/utils/global_defines.h | 3 +-- libsrc/hyperion/MultiColorAdjustment.cpp | 16 ++++++++-------- libsrc/utils/RgbChannelAdjustment.cpp | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/utils/global_defines.h b/include/utils/global_defines.h index e901deb3..b3cbae41 100644 --- a/include/utils/global_defines.h +++ b/include/utils/global_defines.h @@ -1,11 +1,10 @@ #pragma once #include -#include #include #define QSTRING_CSTR(str) str.toUtf8().constData() typedef QList< int > QIntList; -constexpr double DOUBLE_MAX_SQUARED = static_cast(std::numeric_limits::max()) * std::numeric_limits::max(); +constexpr double DOUBLE_UINT8_MAX_SQUARED = static_cast(UINT8_MAX) * UINT8_MAX; diff --git a/libsrc/hyperion/MultiColorAdjustment.cpp b/libsrc/hyperion/MultiColorAdjustment.cpp index b2ea28d7..31b261f8 100644 --- a/libsrc/hyperion/MultiColorAdjustment.cpp +++ b/libsrc/hyperion/MultiColorAdjustment.cpp @@ -125,14 +125,14 @@ void MultiColorAdjustment::applyAdjustment(std::vector& ledColors) uint32_t nr_g = static_cast((UINT8_MAX - ored) * ogreen); uint32_t r_g = static_cast(ored * ogreen); - uint8_t black = static_cast(nr_ng * (UINT8_MAX - oblue) / DOUBLE_MAX_SQUARED); - uint8_t red = static_cast(r_ng * (UINT8_MAX - oblue) / DOUBLE_MAX_SQUARED); - uint8_t green = static_cast(nr_g * (UINT8_MAX - oblue) / DOUBLE_MAX_SQUARED); - uint8_t blue = static_cast(nr_ng * (oblue) / DOUBLE_MAX_SQUARED); - uint8_t cyan = static_cast(nr_g * (oblue) / DOUBLE_MAX_SQUARED); - uint8_t magenta = static_cast(r_ng * (oblue) / DOUBLE_MAX_SQUARED); - uint8_t yellow = static_cast(r_g * (UINT8_MAX - oblue) / DOUBLE_MAX_SQUARED); - uint8_t white = static_cast(r_g * (oblue) / DOUBLE_MAX_SQUARED); + uint8_t black = static_cast(nr_ng * (UINT8_MAX - oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t red = static_cast(r_ng * (UINT8_MAX - oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t green = static_cast(nr_g * (UINT8_MAX - oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t blue = static_cast(nr_ng * (oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t cyan = static_cast(nr_g * (oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t magenta = static_cast(r_ng * (oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t yellow = static_cast(r_g * (UINT8_MAX - oblue) / DOUBLE_UINT8_MAX_SQUARED); + uint8_t white = static_cast(r_g * (oblue) / DOUBLE_UINT8_MAX_SQUARED); uint8_t OR, OG, OB; // Original Colors uint8_t RR, RG, RB; // Red Adjustments diff --git a/libsrc/utils/RgbChannelAdjustment.cpp b/libsrc/utils/RgbChannelAdjustment.cpp index 96647adf..1e5723f0 100644 --- a/libsrc/utils/RgbChannelAdjustment.cpp +++ b/libsrc/utils/RgbChannelAdjustment.cpp @@ -61,7 +61,7 @@ void RgbChannelAdjustment::apply(uint8_t input, uint8_t brightness, uint8_t & re if (!_initialized[input]) { - const double adjustedInput = _brightness * input / DOUBLE_MAX_SQUARED; + const double adjustedInput = _brightness * input / DOUBLE_UINT8_MAX_SQUARED; _mapping.red[input] = static_cast(qBound(0, static_cast(_adjust.red * adjustedInput), static_cast(UINT8_MAX))); _mapping.green[input] = static_cast(qBound(0 ,static_cast(_adjust.green * adjustedInput), static_cast(UINT8_MAX))); _mapping.blue[input] = static_cast(qBound(0, static_cast(_adjust.blue * adjustedInput), static_cast(UINT8_MAX)));