TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

linear to hsb and back again requires srgb calcs

Browse source
This commit is contained in:
marauder2k7 2025-01-23 19:37:15 +00:00
parent 7ffb27dab3
commit 93352f5754
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Engine/source/core/color.h
View file

@ -108,7 +108,7 @@ public:
U32 getARGBPack() const; U32 getARGBPack() const;
U32 getRGBAPack() const; U32 getRGBAPack() const;
U32 getABGRPack() const; U32 getABGRPack() const;
Hsb getHSB() const; Hsb getHSB();
void interpolate(const LinearColorF& in_rC1, void interpolate(const LinearColorF& in_rC1,
const LinearColorF& in_rC2, const LinearColorF& in_rC2,
@ -504,16 +504,24 @@ inline void LinearColorF::set(const Hsb& color)
r = c; g = 0.0; b = x; r = c; g = 0.0; b = x;
} }
red = static_cast<F32>(r + m); r += m;
green = static_cast<F32>(g + m); g += m;
blue = static_cast<F32>(b + m); b += m;
red = static_cast<F32>(srgbToLinearChannel(r));
green = static_cast<F32>(srgbToLinearChannel(g));
blue = static_cast<F32>(srgbToLinearChannel(b));
alpha = 1.0f; // Default alpha to 1.0 alpha = 1.0f; // Default alpha to 1.0
} }
inline Hsb LinearColorF::getHSB() const inline Hsb LinearColorF::getHSB()
{ {
F32 maxVal = mMax( red, mMax(green, blue)); F32 r = linearChannelToSrgb(red);
F32 minVal = mMin(red, mMin(green, blue)); F32 g = linearChannelToSrgb(green);
F32 b = linearChannelToSrgb(blue);
F32 maxVal = mMax(r, mMax(g, b));
F32 minVal = mMin(r, mMin(g, b));
F32 delta = maxVal - minVal; F32 delta = maxVal - minVal;
Hsb hsb; Hsb hsb;
@ -521,12 +529,12 @@ inline Hsb LinearColorF::getHSB() const
hsb.sat = (maxVal > 0.0f) ? (delta / maxVal) * 100.0 : 0.0; hsb.sat = (maxVal > 0.0f) ? (delta / maxVal) * 100.0 : 0.0;
if (delta > 0.0f) { if (delta > 0.0f) {
if (red == maxVal) if (r == maxVal)
hsb.hue = 60.0 * mFmod(((green - blue) / delta), 6.0); hsb.hue = 60.0 * mFmod(((g - b) / delta), 6.0);
else if (green == maxVal) else if (g == maxVal)
hsb.hue = 60.0 * (((blue - red) / delta) + 2.0); hsb.hue = 60.0 * (((b - r) / delta) + 2.0);
else else
hsb.hue = 60.0 * (((red - green) / delta) + 4.0); hsb.hue = 60.0 * (((r - g) / delta) + 4.0);
if (hsb.hue < 0.0) if (hsb.hue < 0.0)
hsb.hue += 360.0; hsb.hue += 360.0;