mirror of
https://github.com/orange-cpp/omath.git
synced 2026-02-13 07:03:25 +00:00
Merge pull request #35 from orange-cpp/u/orange-cpp/imrpoved-color
U/orange cpp/imrpoved color
This commit is contained in:
GitHub
@@ -12,111 +12,153 @@ namespace omath
|
||||
{
|
||||
struct HSV
|
||||
{
|
||||
float m_hue{};
|
||||
float m_saturation{};
|
||||
float m_value{};
|
||||
float hue{};
|
||||
float saturation{};
|
||||
float value{};
|
||||
};
|
||||
|
||||
|
||||
class Color final : public Vector4<float>
|
||||
{
|
||||
public:
|
||||
constexpr Color(const float r, const float g, const float b, const float a) : Vector4(r,g,b,a)
|
||||
public:
|
||||
constexpr Color(const float r, const float g, const float b, const float a) : Vector4(r, g, b, a)
|
||||
{
|
||||
Clamp(0.f, 1.f);
|
||||
}
|
||||
|
||||
constexpr explicit Color() = default;
|
||||
[[nodiscard]]
|
||||
constexpr static Color FromRGBA(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t a)
|
||||
{
|
||||
return Color{Vector4(r, g, b, a) / 255.f};
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr static Color FromHSV(float hue, const float saturation, const float value)
|
||||
{
|
||||
float r{}, g{}, b{};
|
||||
|
||||
hue = std::clamp(hue, 0.f, 1.f);
|
||||
|
||||
const int i = static_cast<int>(hue * 6.f);
|
||||
const float f = hue * 6 - i;
|
||||
const float p = value * (1 - saturation);
|
||||
const float q = value * (1 - f * saturation);
|
||||
const float t = value * (1 - (1 - f) * saturation);
|
||||
|
||||
switch (i % 6)
|
||||
{
|
||||
Clamp(0.f, 1.f);
|
||||
case 0:
|
||||
r = value, g = t, b = p;
|
||||
break;
|
||||
case 1:
|
||||
r = q, g = value, b = p;
|
||||
break;
|
||||
case 2:
|
||||
r = p, g = value, b = t;
|
||||
break;
|
||||
case 3:
|
||||
r = p, g = q, b = value;
|
||||
break;
|
||||
case 4:
|
||||
r = t, g = p, b = value;
|
||||
break;
|
||||
case 5:
|
||||
r = value, g = p, b = q;
|
||||
break;
|
||||
|
||||
default:
|
||||
return {0.f, 0.f, 0.f, 0.f};
|
||||
}
|
||||
|
||||
constexpr explicit Color() : Vector4()
|
||||
{
|
||||
return {r, g, b, 1.f};
|
||||
}
|
||||
|
||||
}
|
||||
[[nodiscard]]
|
||||
constexpr static Color FromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
|
||||
{
|
||||
return Color{Vector4(r, g, b, a) / 255.f};
|
||||
}
|
||||
[[nodiscard]]
|
||||
constexpr static Color FromHSV(const HSV& hsv)
|
||||
{
|
||||
return FromHSV(hsv.hue, hsv.saturation, hsv.value);
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr static Color FromHSV(float hue, float saturation, float value)
|
||||
{
|
||||
float r{}, g{}, b{};
|
||||
[[nodiscard]]
|
||||
constexpr HSV ToHSV() const
|
||||
{
|
||||
HSV hsvData;
|
||||
|
||||
hue = std::clamp(hue, 0.f, 1.f);
|
||||
const float& red = x;
|
||||
const float& green = y;
|
||||
const float& blue = z;
|
||||
|
||||
const int i = static_cast<int>(hue * 6.f);
|
||||
const float f = hue * 6 - i;
|
||||
const float p = value * (1 - saturation);
|
||||
const float q = value * (1 - f * saturation);
|
||||
const float t = value * (1 - (1 - f) * saturation);
|
||||
|
||||
switch (i % 6)
|
||||
{
|
||||
case 0: r = value, g = t, b = p; break;
|
||||
case 1: r = q, g = value, b = p; break;
|
||||
case 2: r = p, g = value, b = t; break;
|
||||
case 3: r = p, g = q, b = value; break;
|
||||
case 4: r = t, g = p, b = value; break;
|
||||
case 5: r = value, g = p, b = q; break;
|
||||
|
||||
default: return {0.f, 0.f, 0.f, 0.f};
|
||||
}
|
||||
|
||||
return {r, g, b, 1.f};
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr HSV ToHSV() const
|
||||
{
|
||||
HSV hsvData;
|
||||
|
||||
const float& red = x;
|
||||
const float& green = y;
|
||||
const float& blue = z;
|
||||
|
||||
const float max = std::max({red, green, blue});
|
||||
const float min = std::min({red, green, blue});
|
||||
const float delta = max - min;
|
||||
const float max = std::max({red, green, blue});
|
||||
const float min = std::min({red, green, blue});
|
||||
const float delta = max - min;
|
||||
|
||||
|
||||
if (delta == 0.f)
|
||||
hsvData.m_hue = 0.f;
|
||||
if (delta == 0.f)
|
||||
hsvData.hue = 0.f;
|
||||
|
||||
else if (max == red)
|
||||
hsvData.m_hue = 60.f * (std::fmodf(((green - blue) / delta), 6.f));
|
||||
else if (max == green)
|
||||
hsvData.m_hue = 60.f * (((blue - red) / delta) + 2.f);
|
||||
else if (max == blue)
|
||||
hsvData.m_hue = 60.f * (((red - green) / delta) + 4.f);
|
||||
else if (max == red)
|
||||
hsvData.hue = 60.f * (std::fmodf(((green - blue) / delta), 6.f));
|
||||
else if (max == green)
|
||||
hsvData.hue = 60.f * (((blue - red) / delta) + 2.f);
|
||||
else if (max == blue)
|
||||
hsvData.hue = 60.f * (((red - green) / delta) + 4.f);
|
||||
|
||||
if (hsvData.m_hue < 0.f)
|
||||
hsvData.m_hue += 360.f;
|
||||
if (hsvData.hue < 0.f)
|
||||
hsvData.hue += 360.f;
|
||||
|
||||
hsvData.m_hue /= 360.f;
|
||||
hsvData.m_saturation = max == 0.f ? 0.f : delta / max;
|
||||
hsvData.m_value = max;
|
||||
hsvData.hue /= 360.f;
|
||||
hsvData.saturation = max == 0.f ? 0.f : delta / max;
|
||||
hsvData.value = max;
|
||||
|
||||
return hsvData;
|
||||
}
|
||||
return hsvData;
|
||||
}
|
||||
|
||||
constexpr explicit Color(const Vector4& vec) : Vector4(vec)
|
||||
{
|
||||
Clamp(0.f, 1.f);
|
||||
}
|
||||
constexpr explicit Color(const Vector4& vec) : Vector4(vec)
|
||||
{
|
||||
Clamp(0.f, 1.f);
|
||||
}
|
||||
consteval void SetHue(const float hue)
|
||||
{
|
||||
auto hsv = ToHSV();
|
||||
hsv.hue = hue;
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr Color Blend(const Color& other, float ratio) const
|
||||
{
|
||||
return Color( (*this * (1.f - ratio)) + (other * ratio) );
|
||||
}
|
||||
*this = FromHSV(hsv);
|
||||
}
|
||||
|
||||
[[nodiscard]] static constexpr Color Red() {return {1.f, 0.f, 0.f, 1.f};}
|
||||
[[nodiscard]] static constexpr Color Green() {return {0.f, 1.f, 0.f, 1.f};}
|
||||
[[nodiscard]] static constexpr Color Blue() {return {0.f, 0.f, 1.f, 1.f};}
|
||||
consteval void SetSaturation(const float saturation)
|
||||
{
|
||||
auto hsv = ToHSV();
|
||||
hsv.saturation = saturation;
|
||||
|
||||
*this = FromHSV(hsv);
|
||||
}
|
||||
|
||||
consteval void SetValue(const float value)
|
||||
{
|
||||
auto hsv = ToHSV();
|
||||
hsv.value = value;
|
||||
|
||||
*this = FromHSV(hsv);
|
||||
}
|
||||
[[nodiscard]]
|
||||
constexpr Color Blend(const Color& other, float ratio) const
|
||||
{
|
||||
ratio = std::clamp(ratio, 0.f, 1.f);
|
||||
return Color(*this * (1.f - ratio) + other * ratio);
|
||||
}
|
||||
|
||||
[[nodiscard]] static constexpr Color Red()
|
||||
{
|
||||
return {1.f, 0.f, 0.f, 1.f};
|
||||
}
|
||||
[[nodiscard]] static constexpr Color Green()
|
||||
{
|
||||
return {0.f, 1.f, 0.f, 1.f};
|
||||
}
|
||||
[[nodiscard]] static constexpr Color Blue()
|
||||
{
|
||||
return {0.f, 0.f, 1.f, 1.f};
|
||||
}
|
||||
};
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr Color Blend(const Color& first, const Color& second, float ratio)
|
||||
{
|
||||
return Color{first * (1.f - std::clamp(ratio, 0.f, 1.f)) + second * ratio};
|
||||
}
|
||||
}
|
||||
} // namespace omath
|
||||
|
||||
@@ -63,9 +63,9 @@ TEST_F(UnitTestColor, FromHSV)
|
||||
TEST_F(UnitTestColor, ToHSV)
|
||||
{
|
||||
HSV hsv = color1.ToHSV(); // Red color
|
||||
EXPECT_FLOAT_EQ(hsv.m_hue, 0.0f);
|
||||
EXPECT_FLOAT_EQ(hsv.m_saturation, 1.0f);
|
||||
EXPECT_FLOAT_EQ(hsv.m_value, 1.0f);
|
||||
EXPECT_FLOAT_EQ(hsv.hue, 0.0f);
|
||||
EXPECT_FLOAT_EQ(hsv.saturation, 1.0f);
|
||||
EXPECT_FLOAT_EQ(hsv.value, 1.0f);
|
||||
}
|
||||
|
||||
// Test color blending
|
||||
@@ -106,7 +106,7 @@ TEST_F(UnitTestColor, BlendVector3)
|
||||
{
|
||||
constexpr Color v1(1.0f, 0.0f, 0.0f, 1.f); // Red
|
||||
constexpr Color v2(0.0f, 1.0f, 0.0f, 1.f); // Green
|
||||
constexpr Color blended = Blend(v1, v2, 0.5f);
|
||||
constexpr Color blended = v1.Blend(v2, 0.5f);
|
||||
EXPECT_FLOAT_EQ(blended.x, 0.5f);
|
||||
EXPECT_FLOAT_EQ(blended.y, 0.5f);
|
||||
EXPECT_FLOAT_EQ(blended.z, 0.0f);
|
||||
|
||||
Reference in New Issue
Block a user