AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from lioncash/color 

CColor: Correct luminance setting within toHSL()
This commit is contained in:
Phillip Stephens 2019-09-05 19:36:32 -07:00 committed by GitHub
parent 63ecd31813 9f0c1e8218
commit 419c1369ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/CColor.cpp
View File

@ -53,22 +53,24 @@ void CColor::fromHSV(float h, float s, float v, float _a) {
} }
void CColor::toHSV(float& h, float& s, float& v) const { void CColor::toHSV(float& h, float& s, float& v) const {
float min = std::min(r(), std::min(g(), b())); const float min = std::min({r(), g(), b()});
float max = std::max(r(), std::max(g(), b())); const float max = std::max({r(), g(), b()});
v = max; v = max;
float delta = max - min; const float delta = max - min;
s = max == 0.f ? 0.f : delta / max; s = max == 0.f ? 0.f : delta / max;
if (max == min) if (max == min) {
h = 0.f; h = 0.f;
else { } else {
if (max == r()) if (max == r()) {
h = (g() - b()) / delta + (g() < b() ? 6.f : 0.f); h = (g() - b()) / delta + (g() < b() ? 6.f : 0.f);
else if (max == g()) } else if (max == g()) {
h = (b() - r()) / delta + 2.f; h = (b() - r()) / delta + 2.f;
else if (max == b()) } else if (max == b()) {
h = (r() - g()) / delta + 4.f; h = (r() - g()) / delta + 4.f;
}
h /= 6.f; h /= 6.f;
} }
} }
@ -87,20 +89,24 @@ void CColor::fromHSL(float h, float s, float l, float _a) {
} }
void CColor::toHSL(float& h, float& s, float& l) const { void CColor::toHSL(float& h, float& s, float& l) const {
const float min = std::min(r(), std::min(g(), b())); const float min = std::min({r(), g(), b()});
const float max = std::max(r(), std::max(g(), b())); const float max = std::max({r(), g(), b()});
const float d = max - min;
if (max == min) l = (max + min) / 2.0f;
if (max == min) {
h = s = 0.f; h = s = 0.f;
else { } else {
const float d = max - min;
s = l > 0.5f ? d / (2.f - max - min) : d / (max + min); s = l > 0.5f ? d / (2.f - max - min) : d / (max + min);
if (max == r())
if (max == r()) {
h = (g() - b()) / d + (g() < b() ? 6.f : 0.f); h = (g() - b()) / d + (g() < b() ? 6.f : 0.f);
else if (max == g()) } else if (max == g()) {
h = (b() - r()) / d + 2.f; h = (b() - r()) / d + 2.f;
else if (max == b()) } else if (max == b()) {
h = (r() - g()) / d + 4.f; h = (r() - g()) / d + 4.f;
}
h /= 6.f; h /= 6.f;
} }