feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

Merge branch 'constexpr-color' into fixes

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-04-01 21:08:53 +02:00
parent b541fc0883 3f57cb6262
commit c1b2d60757
1 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/internal/RgbColor.h
View File

@ -26,6 +26,8 @@ License along with NeoPixel. If not, see
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <cstdlib>
#include <algorithm>
#include "NeoSettings.h" #include "NeoSettings.h"
@ -156,7 +158,9 @@ private:
inline static constexpr uint8_t _elementBrighten(uint8_t value, uint8_t ratio); inline static constexpr uint8_t _elementBrighten(uint8_t value, uint8_t ratio);
inline static constexpr float _CalcColor(float p, float q, float t); inline static constexpr float _CalcColor(float p, float q, float t);
inline static constexpr RgbColor convertToRgbColor(const HslColor& color); inline static constexpr RgbColor convertToRgbColor(const HslColor& color);
inline static constexpr RgbColor convertToRgbColor(const HsbColor& color); inline static constexpr RgbColor convertToRgbColor(HsbColor color);
inline static constexpr bool fuzzyCompare(double p1, double p2);
inline static constexpr bool fuzzyCompare(float p1, float p2);
}; };
#include "HslColor.h" #include "HslColor.h"
@ -374,70 +378,68 @@ constexpr RgbColor RgbColor::convertToRgbColor(const HslColor& color)
return RgbColor{(uint8_t)(r * 255.0f), (uint8_t)(g * 255.0f), (uint8_t)(b * 255.0f)}; return RgbColor{(uint8_t)(r * 255.0f), (uint8_t)(g * 255.0f), (uint8_t)(b * 255.0f)};
} }
constexpr RgbColor RgbColor::convertToRgbColor(const HsbColor& color) constexpr RgbColor RgbColor::convertToRgbColor(HsbColor color)
{ {
float r{}; if (fuzzyCompare(color.S, 0.0f))
float g{}; return RgbColor{uint8_t(color.B), uint8_t(color.B), uint8_t(color.B)}; // achromatic or black
float b{};
float h = color.H; RgbColor rgb{};
float s = color.S;
float v = color.B;
if (color.S == 0.0f) if (color.H < 0.0f)
color.H += 1.0f;
else if (color.H >= 1.0f)
color.H -= 1.0f;
color.H *= 6.0f;
int i = (int)color.H;
float f = color.H - i;
float q = color.B * (1.0f - color.S * f);
float p = color.B * (1.0f - color.S);
float t = color.B * (1.0f - color.S * (1.0f - f));
switch (i)
{ {
r = g = b = v; // achromatic or black case 0:
} rgb.R = color.B;
else rgb.G = t;
{ rgb.B = p;
if (h < 0.0f) break;
{ case 1:
h += 1.0f; rgb.R = q;
} rgb.G = color.B;
else if (h >= 1.0f) rgb.B = p;
{ break;
h -= 1.0f; case 2:
} rgb.R = p;
h *= 6.0f; rgb.G = color.B;
int i = (int)h; rgb.B = t;
float f = h - i; break;
float q = v * (1.0f - s * f); case 3:
float p = v * (1.0f - s); rgb.R = p;
float t = v * (1.0f - s * (1.0f - f)); rgb.G = q;
switch (i) rgb.B = color.B;
{ break;
case 0: case 4:
r = v; rgb.R = t;
g = t; rgb.G = p;
b = p; rgb.B = color.B;
break; break;
case 1: default:
r = q; rgb.R = color.B;
g = v; rgb.G = p;
b = p; rgb.B = q;
break; break;
case 2:
r = p;
g = v;
b = t;
break;
case 3:
r = p;
g = q;
b = v;
break;
case 4:
r = t;
g = p;
b = v;
break;
default:
r = v;
g = p;
b = q;
break;
}
} }
return RgbColor{(uint8_t)(r * 255.0f), (uint8_t)(g * 255.0f), (uint8_t)(b * 255.0f)}; return rgb;
}
constexpr bool RgbColor::fuzzyCompare(double p1, double p2)
{
return (std::abs(p1 - p2) * 1000000000000. <= std::min(std::abs(p1), std::abs(p2)));
}
constexpr bool RgbColor::fuzzyCompare(float p1, float p2)
{
return (std::abs(p1 - p2) * 100000.f <= std::min(std::abs(p1), std::abs(p2)));
} }