X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcolor.h;h=e57689bffe559d8f411670f910cceaa2ed94ead0;hp=c45751d02642b4f2434614889f0f2d360efbeebe;hb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea;hpb=033de13fa0a81be466666ed0d0080b1c2221baec diff --git a/source/color.h b/source/color.h index c45751d0..e57689bf 100644 --- a/source/color.h +++ b/source/color.h @@ -1,9 +1,17 @@ #ifndef MSP_GL_COLOR_H_ #define MSP_GL_COLOR_H_ +#include + namespace Msp { namespace GL { +inline float to_srgb(float c) +{ return (c<=0.0031308f ? 12.92f*c : 1.055f*std::pow(c, 1/2.4f)-0.055f); } + +inline float to_linear(float c) +{ return (c<=0.04045 ? c/12.92f : std::pow((c+0.055f)/1.055f, 2.4f)); } + struct Color { float r, g, b, a; @@ -16,6 +24,9 @@ struct Color Color operator+(const Color &c) const { return Color(r+c.r, g+c.g, b+c.b, 1-(1-a)*(1-c.a)); } bool operator==(const Color &c) const { return (r==c.r && g==c.g && b==c.b && a==c.a); } bool operator!=(const Color &c) const { return !operator==(c); } + + Color to_srgb() const { return Color(GL::to_srgb(r), GL::to_srgb(g), GL::to_srgb(b), a); } + Color to_linear() const { return Color(GL::to_linear(r), GL::to_linear(g), GL::to_linear(b), a); } }; } // namespace GL