Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor HSV/HSL (#1187) 

* Refactor HSV/HSL

some code in `CCParticleSystemQuad.cpp` depends on changes made in `HSV/HSL` classes.

* remove incorrect const&
This commit is contained in:
Turky Mohammed 2023-04-26 12:44:32 +03:00 committed by GitHub
parent aed837b0ae
commit 90bc5108cd
3 changed files with 105 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/2d/CCParticleSystemQuad.cpp
View File

@ -471,11 +471,7 @@ void ParticleSystemQuad::updateParticleQuads()
for (int i = 0; i < _particleCount; for (int i = 0; i < _particleCount;
++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val, ++fadeDt, ++fadeLn) ++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val, ++fadeDt, ++fadeLn)
{ {
float colorR = *r; hsv.fromRgba({*r, *g, *b, *a * (*fadeDt / *fadeLn)});
float colorG = *g;
float colorB = *b;
float colorA = *a * (*fadeDt / *fadeLn);
hsv.set(colorR, colorG, colorB, colorA);
hsv.h += *hue; hsv.h += *hue;
hsv.s = abs(*sat); hsv.s = abs(*sat);
hsv.v = abs(*val); hsv.v = abs(*val);
@ -496,11 +492,7 @@ void ParticleSystemQuad::updateParticleQuads()
for (int i = 0; i < _particleCount; for (int i = 0; i < _particleCount;
++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val, ++fadeDt, ++fadeLn) ++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val, ++fadeDt, ++fadeLn)
{ {
float colorR = *r; hsv.fromRgba({*r, *g, *b, *a * (*fadeDt / *fadeLn)});
float colorG = *g;
float colorB = *b;
float colorA = *a * (*fadeDt / *fadeLn);
hsv.set(colorR, colorG, colorB, colorA);
hsv.h += *hue; hsv.h += *hue;
hsv.s = abs(*sat); hsv.s = abs(*sat);
hsv.v = abs(*val); hsv.v = abs(*val);
@ -559,11 +551,7 @@ void ParticleSystemQuad::updateParticleQuads()
auto hsv = HSV(); auto hsv = HSV();
for (int i = 0; i < _particleCount; ++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val) for (int i = 0; i < _particleCount; ++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val)
{ {
float colorR = *r; hsv.fromRgba({*r, *g, *b, *a});
float colorG = *g;
float colorB = *b;
float colorA = *a;
hsv.set(colorR, colorG, colorB, colorA);
hsv.h += *hue; hsv.h += *hue;
hsv.s = abs(*sat); hsv.s = abs(*sat);
hsv.v = abs(*val); hsv.v = abs(*val);
@ -583,11 +571,7 @@ void ParticleSystemQuad::updateParticleQuads()
auto hsv = HSV(); auto hsv = HSV();
for (int i = 0; i < _particleCount; ++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val) for (int i = 0; i < _particleCount; ++i, ++quad, ++r, ++g, ++b, ++a, ++hue, ++sat, ++val)
{ {
float colorR = *r; hsv.fromRgba({*r, *g, *b, *a});
float colorG = *g;
float colorB = *b;
float colorA = *a;
hsv.set(colorR, colorG, colorB, colorA);
hsv.h += *hue; hsv.h += *hue;
hsv.s = abs(*sat); hsv.s = abs(*sat);
hsv.v = abs(*val); hsv.v = abs(*val);

208
core/base/ccTypes.cpp
View File

@ -280,28 +280,17 @@ HSV::HSV(float _h, float _s, float _v, float _a) : h(_h), s(_s), v(_v), a(_a) {}
HSV::HSV(const Color3B& c) HSV::HSV(const Color3B& c)
{ {
float r = c.r / 255.0F; fromRgba(Color4F(c));
float g = c.g / 255.0F; };
float b = c.b / 255.0F;
set(r, g, b, 1.0F);
}
HSV::HSV(const Color4B& c) HSV::HSV(const Color4B& c)
{ {
float r = c.r / 255.0F; fromRgba(Color4F(c));
float g = c.g / 255.0F;
float b = c.b / 255.0F;
float a = c.a / 255.0F;
set(r, g, b, a);
} }
HSV::HSV(const Color4F& c) HSV::HSV(const Color4F& c)
{ {
float r = c.r; fromRgba(c);
float g = c.g;
float b = c.b;
float a = c.a;
set(r, g, b, a);
} }
bool HSV::operator==(const HSV& right) const bool HSV::operator==(const HSV& right) const
@ -391,43 +380,43 @@ HSV operator/(HSV lhs, float rhs)
return lhs /= rhs; return lhs /= rhs;
} }
void HSV::set(float r, float g, float b, float a) void HSV::fromRgba(const Color4F& rgba)
{ {
float fCMax = MAX(MAX(r, g), b); float fcmax = MAX(MAX(rgba.r, rgba.g), rgba.b);
float fCMin = MIN(MIN(r, g), b); float fcmin = MIN(MIN(rgba.r, rgba.g), rgba.b);
float fDelta = fCMax - fCMin; float fdel = fcmax - fcmin;
if (fDelta > 0) if (fdel > 0)
{ {
if (fCMax == r) if (fcmax == rgba.r)
{ {
h = 60 * (fmod(((g - b) / fDelta), 6)); h = 60 * (fmod(((rgba.g - rgba.b) / fdel), 6));
} }
else if (fCMax == g) else if (fcmax == rgba.g)
{ {
h = 60 * (((b - r) / fDelta) + 2); h = 60 * (((rgba.b - rgba.r) / fdel) + 2);
} }
else if (fCMax == b) else if (fcmax == rgba.b)
{ {
h = 60 * (((r - g) / fDelta) + 4); h = 60 * (((rgba.r - rgba.g) / fdel) + 4);
} }
if (fCMax > 0) if (fcmax > 0)
{ {
s = fDelta / fCMax; s = fdel / fcmax;
} }
else else
{ {
s = 0; s = 0;
} }
v = fCMax; v = fcmax;
} }
else else
{ {
h = 0; h = 0;
s = 0; s = 0;
v = fCMax; v = fcmax;
} }
if (h < 0) if (h < 0)
@ -438,83 +427,81 @@ void HSV::set(float r, float g, float b, float a)
this->a = a; this->a = a;
} }
void HSV::get(float& r, float& g, float& b) const Color4F HSV::toRgba() const
{ {
auto rgba = Color4F(0, 0, 0, a);
float hue = remainder(std::fabs(h), 360); float hue = remainder(std::fabs(h), 360);
hue += 360; hue += 360;
float fC = v * s; float fc = v * s;
float fHPrime = fmod(hue / 60.0, 6); float fhprime = fmod(hue / 60.0, 6);
float fX = fC * (1 - fabs(fmod(fHPrime, 2) - 1)); float fx = fc * (1 - fabs(fmod(fhprime, 2) - 1));
float fM = v - fC; float fm = v - fc;
if (0 <= fHPrime && fHPrime < 1) if (0 <= fhprime && fhprime < 1)
{ {
r = fC; rgba.r = fc;
g = fX; rgba.g = fx;
b = 0; rgba.b = 0;
} }
else if (1 <= fHPrime && fHPrime < 2) else if (1 <= fhprime && fhprime < 2)
{ {
r = fX; rgba.r = fx;
g = fC; rgba.g = fc;
b = 0; rgba.b = 0;
} }
else if (2 <= fHPrime && fHPrime < 3) else if (2 <= fhprime && fhprime < 3)
{ {
r = 0; rgba.r = 0;
g = fC; rgba.g = fc;
b = fX; rgba.b = fx;
} }
else if (3 <= fHPrime && fHPrime < 4) else if (3 <= fhprime && fhprime < 4)
{ {
r = 0; rgba.r = 0;
g = fX; rgba.g = fx;
b = fC; rgba.b = fc;
} }
else if (4 <= fHPrime && fHPrime < 5) else if (4 <= fhprime && fhprime < 5)
{ {
r = fX; rgba.r = fx;
g = 0; rgba.g = 0;
b = fC; rgba.b = fc;
} }
else if (5 <= fHPrime && fHPrime < 6) else if (5 <= fhprime && fhprime < 6)
{ {
r = fC; rgba.r = fc;
g = 0; rgba.g = 0;
b = fX; rgba.b = fx;
} }
else else
{ {
r = 0; rgba.r = 0;
g = 0; rgba.g = 0;
b = 0; rgba.b = 0;
} }
r += fM; rgba.r += fm;
g += fM; rgba.g += fm;
b += fM; rgba.b += fm;
return rgba;
} }
Color3B HSV::toColor3B() Color3B HSV::toColor3B() const
{ {
float r, g, b; return Color3B(toRgba());
get(r, g, b);
return Color3B(r * 255.0F, g * 255.0F, b * 255.0F);
} }
Color4B HSV::toColor4B() Color4B HSV::toColor4B() const
{ {
float r, g, b; return Color4B(toRgba());
get(r, g, b);
return Color4B(r * 255.0F, g * 255.0F, b * 255.0F, a * 255.0F);
} }
Color4F HSV::toColor4F() Color4F HSV::toColor4F() const
{ {
float r, g, b; return toRgba();
get(r, g, b);
return Color4F(r, g, b, a);
} }
HSL::HSL() {} HSL::HSL() {}
@ -522,28 +509,17 @@ HSL::HSL(float _h, float _s, float _l, float _a) : h(_h), s(_s), l(_l), a(_a) {}
HSL::HSL(const Color3B& c) HSL::HSL(const Color3B& c)
{ {
float r = c.r / 255.0F; fromRgba(Color4F(c));
float g = c.g / 255.0F;
float b = c.b / 255.0F;
set(r, g, b, 1.0F);
} }
HSL::HSL(const Color4B& c) HSL::HSL(const Color4B& c)
{ {
float r = c.r / 255.0F; fromRgba(Color4F(c));
float g = c.g / 255.0F;
float b = c.b / 255.0F;
float a = c.a / 255.0F;
set(r, g, b, a);
} }
HSL::HSL(const Color4F& c) HSL::HSL(const Color4F& c)
{ {
float r = c.r; fromRgba(c);
float g = c.g;
float b = c.b;
float a = c.a;
set(r, g, b, a);
} }
bool HSL::operator==(const HSL& right) const bool HSL::operator==(const HSL& right) const
@ -633,10 +609,10 @@ HSL operator/(HSL lhs, float rhs)
return lhs /= rhs; return lhs /= rhs;
} }
void HSL::set(float r, float g, float b, float a) void HSL::fromRgba(const Color4F& rgba)
{ {
float max = MAX(MAX(r, g), b); float max = MAX(MAX(rgba.r, rgba.g), rgba.b);
float min = MIN(MIN(r, g), b); float min = MIN(MIN(rgba.r, rgba.g), rgba.b);
h = s = l = (max + min) / 2; h = s = l = (max + min) / 2;
@ -649,17 +625,17 @@ void HSL::set(float r, float g, float b, float a)
float d = max - min; float d = max - min;
s = (l > 0.5) ? d / (2 - max - min) : d / (max + min); s = (l > 0.5) ? d / (2 - max - min) : d / (max + min);
if (max == r) if (max == rgba.r)
{ {
h = (g - b) / d + (g < b ? 6 : 0); h = (rgba.g - rgba.b) / d + (rgba.g < rgba.b ? 6 : 0);
} }
else if (max == g) else if (max == rgba.g)
{ {
h = (b - r) / d + 2; h = (rgba.b - rgba.r) / d + 2;
} }
else if (max == b) else if (max == rgba.b)
{ {
h = (r - g) / d + 4; h = (rgba.r - rgba.g) / d + 4;
} }
h /= 6; h /= 6;
@ -684,45 +660,43 @@ float HSL::hue2rgb(float p, float q, float t)
return p; return p;
} }
void HSL::get(float& r, float& g, float& b) const Color4F HSL::toRgba() const
{ {
auto rgba = Color4F(0, 0, 0, a);
float hue = remainder(std::fabs(h), 360); float hue = remainder(std::fabs(h), 360);
hue += 360; hue += 360;
hue /= 360.0F; hue /= 360.0F;
if (0 == s) if (0 == s)
{ {
r = g = b = l; rgba.r = rgba.g = rgba.b = l;
} }
else else
{ {
float q = l < 0.5 ? l * (1 + s) : l + s - l * s; float q = l < 0.5 ? l * (1 + s) : l + s - l * s;
float p = 2 * l - q; float p = 2 * l - q;
r = hue2rgb(p, q, hue + 1. / 3); rgba.r = hue2rgb(p, q, hue + 1. / 3);
g = hue2rgb(p, q, hue); rgba.g = hue2rgb(p, q, hue);
b = hue2rgb(p, q, hue - 1. / 3); rgba.b = hue2rgb(p, q, hue - 1. / 3);
} }
return rgba;
} }
Color3B HSL::toColor3B() Color3B HSL::toColor3B() const
{ {
float r, g, b; return Color3B(toRgba());
get(r, g, b);
return Color3B(r * 255.0F, g * 255.0F, b * 255.0F);
} }
Color4B HSL::toColor4B() Color4B HSL::toColor4B() const
{ {
float r, g, b; return Color4B(toRgba());
get(r, g, b);
return Color4B(r * 255.0F, g * 255.0F, b * 255.0F, a * 255.0F);
} }
Color4F HSL::toColor4F() Color4F HSL::toColor4F() const
{ {
float r, g, b; return Color4F(toRgba());
get(r, g, b);
return Color4F(r, g, b, a);
} }
const BlendFunc BlendFunc::DISABLE = {backend::BlendFactor::ONE, backend::BlendFactor::ZERO}; const BlendFunc BlendFunc::DISABLE = {backend::BlendFactor::ONE, backend::BlendFactor::ZERO};

20
core/base/ccTypes.h
View File

@ -196,12 +196,12 @@ struct AX_DLL HSV
bool equals(const HSV& other) const { return (*this == other); } bool equals(const HSV& other) const { return (*this == other); }
void set(float r, float g, float b, float a = 1.0F); void fromRgba(const Color4F& rgba);
void get(float& r, float& g, float& b) const; Color4F toRgba() const;
Color3B toColor3B(); Color3B toColor3B() const;
Color4B toColor4B(); Color4B toColor4B() const;
Color4F toColor4F(); Color4F toColor4F() const;
float h = 0.f; float h = 0.f;
float s = 0.f; float s = 0.f;
@ -245,14 +245,14 @@ struct AX_DLL HSL
bool equals(const HSL& other) const { return (*this == other); } bool equals(const HSL& other) const { return (*this == other); }
void set(float r, float g, float b, float a = 1.0F); void fromRgba(const Color4F& rgba);
void get(float& r, float& g, float& b) const; Color4F toRgba() const;
static float hue2rgb(float p, float q, float t); static float hue2rgb(float p, float q, float t);
Color3B toColor3B(); Color3B toColor3B() const;
Color4B toColor4B(); Color4B toColor4B() const;
Color4F toColor4F(); Color4F toColor4F() const;
float h = 0.f; float h = 0.f;
float s = 0.f; float s = 0.f;