AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

We define types for components, use them 

Use multiplication for char -> float conversion for speed
This commit is contained in:
Phillip Stephens 2016-02-22 21:27:51 -08:00
parent a857250ccf
commit e909f08838
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/CColor.hpp
View File

@ -18,18 +18,19 @@
namespace Zeus namespace Zeus
{ {
typedef uint8_t Comp8;
typedef uint32_t Comp32;
constexpr float OneOver255 = 1.f/255.f;
typedef union typedef union
{ {
struct struct
{ {
unsigned char r, g, b, a; Comp8 r, g, b, a;
}; };
unsigned int rgba; Comp32 rgba;
} RGBA32; } RGBA32;
typedef uint8_t Comp8;
typedef uint32_t Comp32;
class CVector4f; class CVector4f;
class alignas(16) CColor class alignas(16) CColor
@ -265,21 +266,36 @@ public:
#endif #endif
}; };
void fromRGBA8(unsigned char r, unsigned char g, unsigned char b, unsigned char a) void fromRGBA8(Comp8 r, Comp8 g, Comp8 b, Comp8 a)
{ {
this->r = r / 255.f; this->r = r * OneOver255;
this->g = g / 255.f; this->g = g * OneOver255;
this->b = b / 255.f; this->b = b * OneOver255;
this->a = a / 255.f; this->a = a * OneOver255;
} }
void fromRGBA32(unsigned int rgba) void fromRGBA32(Comp32 rgba)
{ {
static RGBA32 tmp; static RGBA32 tmp;
tmp.rgba = COLOR(rgba); tmp.rgba = COLOR(rgba);
fromRGBA8(tmp.r, tmp.g, tmp.b, tmp.a); fromRGBA8(tmp.r, tmp.g, tmp.b, tmp.a);
} }
/*!
* \brief Converts a CColor to RGBA8
* \param r
* \param g
* \param b
* \param a
*/
void toRGBA8(Comp8& r, Comp8& g, Comp8& b, Comp8& a)
{
r = this->r * 255;
g = this->g * 255;
b = this->b * 255;
a = this->a * 255;
}
/** /**
* @brief Assigns rgba from hsv * @brief Assigns rgba from hsv
* @param h[0-1] The hue percentagee of the color. * @param h[0-1] The hue percentagee of the color.