Modernize CColor
class
* Use `constexpr` * Add c'tor for `float` to avoid unnecassary conversions if arguments are already `float` * Simplify syntax in `operator==`
This commit is contained in:
parent
39882a6db6
commit
36b970ebcb
32
src/Cfg.h
32
src/Cfg.h
|
@ -48,22 +48,30 @@
|
||||||
class CColor
|
class CColor
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CColor() { red = green = blue = 0; }
|
constexpr CColor()
|
||||||
|
: red(0.0f)
|
||||||
|
, green(0.0f)
|
||||||
|
, blue(0.0f)
|
||||||
|
{}
|
||||||
|
|
||||||
CColor(double r, double g, double b)
|
constexpr CColor(float r, float g, float b)
|
||||||
|
: red(r)
|
||||||
|
, green(g)
|
||||||
|
, blue(b)
|
||||||
|
{}
|
||||||
|
|
||||||
|
constexpr CColor(double r, double g, double b)
|
||||||
|
: red(static_cast<float>(r))
|
||||||
|
, green(static_cast<float>(g))
|
||||||
|
, blue(static_cast<float>(b))
|
||||||
|
{}
|
||||||
|
|
||||||
|
constexpr bool operator==(CColor color)
|
||||||
{
|
{
|
||||||
red = static_cast<float>(r);
|
return red == color.red && green == color.green && blue == color.blue;
|
||||||
green = static_cast<float>(g);
|
|
||||||
blue = static_cast<float>(b);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
float red, green, blue;
|
float red, green, blue;
|
||||||
|
|
||||||
bool operator==(CColor color)
|
|
||||||
{
|
|
||||||
if (red == color.red && green == color.green && blue == color.blue)
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
Loading…
Reference in New Issue
Block a user