Merge pull request #1749 from Azaezel/linearizeLights

adds toLinear and toGamma helper functions for ColorF, uses the former in adjusting lights.
This commit is contained in:
Anis 2016-09-04 02:06:00 +02:00 committed by GitHub
commit 8cae1e5dcb
2 changed files with 16 additions and 3 deletions

View file

@ -104,6 +104,9 @@ class ColorF
(alpha >= 0.0f && alpha <= 1.0f); }
void clamp();
ColorF toLinear() const;
ColorF toGamma() const;
static const ColorF ZERO;
static const ColorF ONE;
static const ColorF WHITE;
@ -462,6 +465,16 @@ inline void ColorF::clamp()
alpha = 0.0f;
}
inline ColorF ColorF::toLinear() const
{
return ColorF(mPow(red, 2.2f), mPow(green, 2.2f), mPow(blue, 2.2f), alpha);
}
inline ColorF ColorF::toGamma() const
{
return ColorF(mPow(red, 1.0f / 2.2f), mPow(green, 1.0f / 2.2f), mPow(blue, 1.0f / 2.2f), alpha);
}
//------------------------------------------------------------------------------
//-------------------------------------- INLINES (ColorI)
//