Port Color4 to NMF

engine/core/math/Color4.h

@@ -32,359 +32,362 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-/// RGBA color.
-/// 
-/// Maintains 3 float values each representing a primary
-/// color intensity. An extra component is used as transparency
-/// coefficient. Each component ranges from 0.0 to 1.0; the higher
-/// the value the brighter the color. An alpha value of 0.0 means
-/// totally transparent while a value of 1.0 means totally opaque.
-/// 
-/// It also offers a set of color name constants compliant with SVG 1.0.
+/// Holds RGBA color as four floats.
+///
+/// @ingroup Math
 struct Color4
 {
-public:
+	Color4();
+	Color4(float r, float g, float b);		
+	Color4(int r, int g, int b);
+	Color4(float r, float g, float b, float a);
+	Color4(int r, int g, int b, int a);		
+	explicit Color4(float c[4]);
 
-	float					r, g, b, a;
+	/// Construct from 32-bit integer (red at MSB, alpha at LSB)
+	explicit Color4(uint32_t rgba);
 
-public:
+	float& operator[](uint32_t i);				
+	const float& operator[](uint32_t i) const;
 
-	/// Does nothing for efficiency
-							Color4();					
-							~Color4();								
-							Color4(const Color4& c);				
-							Color4(float r, float g, float b);		
-							Color4(int r, int g, int b);			
-							Color4(float r, float g, float b, float a);
-							Color4(int r, int g, int b, int a);		
-	explicit				Color4(float c[4]);	
-
-	/// Construct from 32-bit integer (red at MSB, alpha at LSB)					
-	explicit				Color4(uint32_t rgba);
-
-	/// Returns the color as a packed 32-bit integer. (RGBA order, alpha assumed = 255)
-	uint32_t				to_rgb() const;		
-
-	/// Returns the color as a packed 32-bit integer. (ABGR order, alpha assumed = 255)
-	uint32_t				to_bgr() const;	
-
-	/// Returns the color as a packed 32-bit integer. (RGBA order)	
-	uint32_t				to_rgba() const;	
-
-	/// Returns the color as a packed 32-bit integer. (ABGR order)
-	uint32_t				to_abgr() const;	
-
-	/// Random access by index. (red = 0, alpha = 3)
-	float					operator[](uint32_t i) const;		
-
-	/// Random access by index. (red = 0, alpha = 3)		
-	float&					operator[](uint32_t i);				
-
-	Color4					operator+(const Color4& c) const;
-	Color4&					operator+=(const Color4& c);		
-	Color4					operator-(const Color4& c) const;		
-	Color4&					operator-=(const Color4& c);		
-	Color4					operator*(const Color4& c) const;		
-	Color4&					operator*=(const Color4& c);		
-	Color4					operator*(float scalar) const;				
-	Color4&					operator*=(float scalar);				
-
-	bool					operator==(const Color4& other) const;
-	bool					operator!=(const Color4& other) const;	
-
-	/// Returns the pointer to the color's data.
-	float*					to_float_ptr();		
-
-	/// Returns the pointer to the color's data.						
-	const float*			to_float_ptr() const;
+	Color4& operator+=(const Color4& c);
+	Color4& operator-=(const Color4& c);
+	Color4& operator*=(const Color4& c);
+	Color4& operator*=(float k);
 
 	// SVG 1.0 color names
-	static const Color4		ALICEBLUE;
-	static const Color4		ANTIQUEWHITE;
-	static const Color4		AQUA;
-	static const Color4		AQUAMARINE;
-	static const Color4		AZURE;
-	static const Color4		BEIGE;
-	static const Color4		BISQUE;
-	static const Color4		BLACK;
-	static const Color4		BLANCHEDALMOND;
-	static const Color4		BLUE;
-	static const Color4		BLUEVIOLET;
-	static const Color4		BROWN;
-	static const Color4		BURLYWOOD;
-	static const Color4		CADETBLUE;
-	static const Color4		CHARTREUSE;
-	static const Color4		CHOCOLATE;
-	static const Color4		CORAL;
-	static const Color4		CORNFLOWERBLUE;
-	static const Color4		CORNSILK;
-	static const Color4		CRIMSON;
-	static const Color4		CYAN;
-	static const Color4		DARKBLUE;
-	static const Color4		DARKCYAN;
-	static const Color4		DARKGOLDENROD;
-	static const Color4		DARKGRAY;
-	static const Color4		DARKGREEN;
-	static const Color4		DARKGREY;
-	static const Color4		DARKKHAKI;
-	static const Color4		DARKMAGENTA;
-	static const Color4		DARKOLIVEGREEN;
-	static const Color4		DARKORANGE;
-	static const Color4		DARKORCHID;
-	static const Color4		DARKRED;
-	static const Color4		DARKSALMON;
-	static const Color4		DARKSEAGREEN;
-	static const Color4		DARKSLATEBLUE;
-	static const Color4		DARKSLATEGRAY;
-	static const Color4		DARKSLATEGREY;
-	static const Color4		DARKTURQUOISE;
-	static const Color4		DARKVIOLET;
-	static const Color4		DEEPPINK;
-	static const Color4		DEEPSKYBLUE;
-	static const Color4		DIMGRAY;
-	static const Color4		DIMGREY;
-	static const Color4		DODGERBLUE;
-	static const Color4		FIREBRICK;
-	static const Color4		FLORALWHITE;
-	static const Color4		FORESTGREEN;
-	static const Color4		FUCHSIA;
-	static const Color4		GAINSBORO;
-	static const Color4		GHOSTWHITE;
-	static const Color4		GOLD;
-	static const Color4		GOLDENROD;
-	static const Color4		GRAY;
-	static const Color4		GREEN;
-	static const Color4		GREENYELLOW;
-	static const Color4		GREY;
-	static const Color4		HONEYDEW;
-	static const Color4		HOTPINK;
-	static const Color4		INDIANRED;
-	static const Color4		INDIGO;
-	static const Color4		IVORY;
-	static const Color4		KHAKI;
-	static const Color4		LAVENDER;
-	static const Color4		LAVENDERBLUSH;
-	static const Color4		LAWNGREEN;
-	static const Color4		LEMONCHIFFON;
-	static const Color4		LIGHTBLUE;
-	static const Color4		LIGHTCORAL;
-	static const Color4		LIGHTCYAN;
-	static const Color4		LIGHTGOLDENRODYELLOW;
-	static const Color4		LIGHTGRAY;
-	static const Color4		LIGHTGREEN;
-	static const Color4		LIGHTGREY;
-	static const Color4		LIGHTPINK;
-	static const Color4		LIGHTSALMON;
-	static const Color4		LIGHTSEAGREEN;
-	static const Color4		LIGHTSKYBLUE;
-	static const Color4		LIGHTSLATEGRAY;
-	static const Color4		LIGHTSLATEGREY;
-	static const Color4		LIGHTSTEELBLUE;
-	static const Color4		LIGHTYELLOW;
-	static const Color4		LIME;
-	static const Color4		LIMEGREEN;
-	static const Color4		LINEN;
-	static const Color4		MAGENTA;
-	static const Color4		MAROON;
-	static const Color4		MEDIUMAQUAMARINE;
-	static const Color4		MEDIUMBLUE;
-	static const Color4		MEDIUMORCHID;
-	static const Color4		MEDIUMPURPLE;
-	static const Color4		MEDIUMSEAGREEN;
-	static const Color4		MEDIUMSLATEBLUE;
-	static const Color4		MEDIUMSPRINGGREEN;
-	static const Color4		MEDIUMTURQUOISE;
-	static const Color4		MEDIUMVIOLETRED;
-	static const Color4		MIDNIGHTBLUE;
-	static const Color4		MINTCREAM;
-	static const Color4		MISTYROSE;
-	static const Color4		MOCCASIN;
-	static const Color4		NAVAJOWHITE;
-	static const Color4		NAVY;
-	static const Color4		OLDLACE;
-	static const Color4		OLIVE;
-	static const Color4		OLIVEDRAB;
-	static const Color4		ORANGE;
-	static const Color4		ORANGERED;
-	static const Color4		ORCHID;
-	static const Color4		PALEGOLDENROD;
-	static const Color4		PALEGREEN;
-	static const Color4		PALETURQUOISE;
-	static const Color4		PALEVIOLETRED;
-	static const Color4		PAPAYAWHIP;
-	static const Color4		PEACHPUFF;
-	static const Color4		PERU;
-	static const Color4		PINK;
-	static const Color4		PLUM;
-	static const Color4		POWDERBLUE;
-	static const Color4		PURPLE;
-	static const Color4		RED;
-	static const Color4		ROSYBROWN;
-	static const Color4		ROYALBLUE;
-	static const Color4		SADDLEBROWN;
-	static const Color4		SALMON;
-	static const Color4		SANDYBROWN;
-	static const Color4		SEAGREEN;
-	static const Color4		SEASHELL;
-	static const Color4		SIENNA;
-	static const Color4		SILVER;
-	static const Color4		SKYBLUE;
-	static const Color4		SLATEBLUE;
-	static const Color4		SLATEGRAY;
-	static const Color4		SLATEGREY;
-	static const Color4		SNOW;
-	static const Color4		SPRINGGREEN;
-	static const Color4		STEELBLUE;
-	static const Color4		TAN;
-	static const Color4		TEAL;
-	static const Color4		THISTLE;
-	static const Color4		TOMATO;
-	static const Color4		TURQUOISE;
-	static const Color4		VIOLET;
-	static const Color4		WHEAT;
-	static const Color4		WHITE;
-	static const Color4		WHITESMOKE;
-	static const Color4		YELLOW;
-	static const Color4		YELLOWGREEN;
+	static const Color4 ALICEBLUE;
+	static const Color4 ANTIQUEWHITE;
+	static const Color4 AQUA;
+	static const Color4 AQUAMARINE;
+	static const Color4 AZURE;
+	static const Color4 BEIGE;
+	static const Color4 BISQUE;
+	static const Color4 BLACK;
+	static const Color4 BLANCHEDALMOND;
+	static const Color4 BLUE;
+	static const Color4 BLUEVIOLET;
+	static const Color4 BROWN;
+	static const Color4 BURLYWOOD;
+	static const Color4 CADETBLUE;
+	static const Color4 CHARTREUSE;
+	static const Color4 CHOCOLATE;
+	static const Color4 CORAL;
+	static const Color4 CORNFLOWERBLUE;
+	static const Color4 CORNSILK;
+	static const Color4 CRIMSON;
+	static const Color4 CYAN;
+	static const Color4 DARKBLUE;
+	static const Color4 DARKCYAN;
+	static const Color4 DARKGOLDENROD;
+	static const Color4 DARKGRAY;
+	static const Color4 DARKGREEN;
+	static const Color4 DARKGREY;
+	static const Color4 DARKKHAKI;
+	static const Color4 DARKMAGENTA;
+	static const Color4 DARKOLIVEGREEN;
+	static const Color4 DARKORANGE;
+	static const Color4 DARKORCHID;
+	static const Color4 DARKRED;
+	static const Color4 DARKSALMON;
+	static const Color4 DARKSEAGREEN;
+	static const Color4 DARKSLATEBLUE;
+	static const Color4 DARKSLATEGRAY;
+	static const Color4 DARKSLATEGREY;
+	static const Color4 DARKTURQUOISE;
+	static const Color4 DARKVIOLET;
+	static const Color4 DEEPPINK;
+	static const Color4 DEEPSKYBLUE;
+	static const Color4 DIMGRAY;
+	static const Color4 DIMGREY;
+	static const Color4 DODGERBLUE;
+	static const Color4 FIREBRICK;
+	static const Color4 FLORALWHITE;
+	static const Color4 FORESTGREEN;
+	static const Color4 FUCHSIA;
+	static const Color4 GAINSBORO;
+	static const Color4 GHOSTWHITE;
+	static const Color4 GOLD;
+	static const Color4 GOLDENROD;
+	static const Color4 GRAY;
+	static const Color4 GREEN;
+	static const Color4 GREENYELLOW;
+	static const Color4 GREY;
+	static const Color4 HONEYDEW;
+	static const Color4 HOTPINK;
+	static const Color4 INDIANRED;
+	static const Color4 INDIGO;
+	static const Color4 IVORY;
+	static const Color4 KHAKI;
+	static const Color4 LAVENDER;
+	static const Color4 LAVENDERBLUSH;
+	static const Color4 LAWNGREEN;
+	static const Color4 LEMONCHIFFON;
+	static const Color4 LIGHTBLUE;
+	static const Color4 LIGHTCORAL;
+	static const Color4 LIGHTCYAN;
+	static const Color4 LIGHTGOLDENRODYELLOW;
+	static const Color4 LIGHTGRAY;
+	static const Color4 LIGHTGREEN;
+	static const Color4 LIGHTGREY;
+	static const Color4 LIGHTPINK;
+	static const Color4 LIGHTSALMON;
+	static const Color4 LIGHTSEAGREEN;
+	static const Color4 LIGHTSKYBLUE;
+	static const Color4 LIGHTSLATEGRAY;
+	static const Color4 LIGHTSLATEGREY;
+	static const Color4 LIGHTSTEELBLUE;
+	static const Color4 LIGHTYELLOW;
+	static const Color4 LIME;
+	static const Color4 LIMEGREEN;
+	static const Color4 LINEN;
+	static const Color4 MAGENTA;
+	static const Color4 MAROON;
+	static const Color4 MEDIUMAQUAMARINE;
+	static const Color4 MEDIUMBLUE;
+	static const Color4 MEDIUMORCHID;
+	static const Color4 MEDIUMPURPLE;
+	static const Color4 MEDIUMSEAGREEN;
+	static const Color4 MEDIUMSLATEBLUE;
+	static const Color4 MEDIUMSPRINGGREEN;
+	static const Color4 MEDIUMTURQUOISE;
+	static const Color4 MEDIUMVIOLETRED;
+	static const Color4 MIDNIGHTBLUE;
+	static const Color4 MINTCREAM;
+	static const Color4 MISTYROSE;
+	static const Color4 MOCCASIN;
+	static const Color4 NAVAJOWHITE;
+	static const Color4 NAVY;
+	static const Color4 OLDLACE;
+	static const Color4 OLIVE;
+	static const Color4 OLIVEDRAB;
+	static const Color4 ORANGE;
+	static const Color4 ORANGERED;
+	static const Color4 ORCHID;
+	static const Color4 PALEGOLDENROD;
+	static const Color4 PALEGREEN;
+	static const Color4 PALETURQUOISE;
+	static const Color4 PALEVIOLETRED;
+	static const Color4 PAPAYAWHIP;
+	static const Color4 PEACHPUFF;
+	static const Color4 PERU;
+	static const Color4 PINK;
+	static const Color4 PLUM;
+	static const Color4 POWDERBLUE;
+	static const Color4 PURPLE;
+	static const Color4 RED;
+	static const Color4 ROSYBROWN;
+	static const Color4 ROYALBLUE;
+	static const Color4 SADDLEBROWN;
+	static const Color4 SALMON;
+	static const Color4 SANDYBROWN;
+	static const Color4 SEAGREEN;
+	static const Color4 SEASHELL;
+	static const Color4 SIENNA;
+	static const Color4 SILVER;
+	static const Color4 SKYBLUE;
+	static const Color4 SLATEBLUE;
+	static const Color4 SLATEGRAY;
+	static const Color4 SLATEGREY;
+	static const Color4 SNOW;
+	static const Color4 SPRINGGREEN;
+	static const Color4 STEELBLUE;
+	static const Color4 TAN;
+	static const Color4 TEAL;
+	static const Color4 THISTLE;
+	static const Color4 TOMATO;
+	static const Color4 TURQUOISE;
+	static const Color4 VIOLET;
+	static const Color4 WHEAT;
+	static const Color4 WHITE;
+	static const Color4 WHITESMOKE;
+	static const Color4 YELLOW;
+	static const Color4 YELLOWGREEN;
+
+	float r, g, b, a;
 };
 
 //-----------------------------------------------------------------------------
-inline Color4::Color4()
+inline Color4 operator+(Color4 a, const Color4& b)
 {
+	a += b;
+	return a;
 }
 
 //-----------------------------------------------------------------------------
-inline Color4::~Color4()
+inline Color4 operator-(Color4 a, const Color4& b)
 {
+	a -= b;
+	return a;
 }
 
 //-----------------------------------------------------------------------------
-inline Color4::Color4(const Color4& c) : r(c.r), g(c.g), b(c.b), a(c.a)
+inline Color4 operator*(Color4 a, const Color4& b)
 {
+	a *= b;
+	return a;
 }
 
 //-----------------------------------------------------------------------------
-inline Color4::Color4(float r, float g, float b)
+inline Color4 operator*(Color4 a, float k)
 {
-	this->r = r;
-	this->g = g;
-	this->b = b;
-	this->a = 1.0f;
+	a *= k;
+	return a;
 }
 
 //-----------------------------------------------------------------------------
-inline Color4::Color4(int r, int g, int b)
+inline Color4 operator*(float k, Color4 a)
 {
-	this->r = r * math::ONE_OVER_255;
-	this->g = g * math::ONE_OVER_255;
-	this->b = b * math::ONE_OVER_255;
-	this->a = 1.0f;
+	a *= k;
+	return a;
 }
 
-//-----------------------------------------------------------------------------
-inline Color4::Color4(float r, float g, float b, float a)
+/// Functions to mamipulate Color4
+///
+/// @ingroup Math 
+namespace color4
 {
-	this->r = r;
-	this->g = g;
-	this->b = b;
-	this->a = a;
-}
+	/// Returns the color as a packed 32-bit integer. (RGBA order, alpha assumed = 255)
+	uint32_t to_rgb(const Color4& c);
 
-//-----------------------------------------------------------------------------
-inline Color4::Color4(int r, int g, int b, int a)
-{
-	this->r = r * math::ONE_OVER_255;
-	this->g = g * math::ONE_OVER_255;
-	this->b = b * math::ONE_OVER_255;
-	this->a = a * math::ONE_OVER_255;
-}
+	/// Returns the color as a packed 32-bit integer. (ABGR order, alpha assumed = 255)
+	uint32_t to_bgr(const Color4& c);
 
-//-----------------------------------------------------------------------------
-inline Color4::Color4(float c[4])
-{
-	r = c[0];
-	g = c[1];
-	b = c[2];
-	a = c[3];
-}
+	/// Returns the color as a packed 32-bit integer. (RGBA order)	
+	uint32_t to_rgba(const Color4& c);
 
-//-----------------------------------------------------------------------------
-inline Color4::Color4(uint32_t rgba)
+	/// Returns the color as a packed 32-bit integer. (ABGR order)
+	uint32_t to_abgr(const Color4& c);
+
+	/// Returns the pointer to the color's data.
+	float* to_float_ptr(Color4& c);
+
+	/// Returns the pointer to the color's data.						
+	const float* to_float_ptr(const Color4& c);
+} // namespace color4
+
+namespace color4
 {
-	r = math::ONE_OVER_255 * ((rgba & 0xFF000000) >> 24);
-	g = math::ONE_OVER_255 * ((rgba & 0x00FF0000) >> 16);
-	b = math::ONE_OVER_255 * ((rgba & 0x0000FF00) >> 8);
-	a = math::ONE_OVER_255 * (rgba & 0x000000FF);
-}
+	//-----------------------------------------------------------------------------
+	inline uint32_t to_rgb(const Color4& c)
+	{
+		uint32_t rgba;
+
+		rgba =	(uint32_t)(255.0f * c.r) << 24;
+		rgba |= (uint32_t)(255.0f * c.g) << 16;
+		rgba |= (uint32_t)(255.0f * c.b) << 8;
+		rgba |= 255;
+
+		return rgba;
+	}
+
+	//-----------------------------------------------------------------------------
+	inline uint32_t to_bgr(const Color4& c)
+	{
+		uint32_t abgr;
+
+		abgr =	255 << 24;
+		abgr |= (uint32_t)(255.0f * c.b) << 16;
+		abgr |= (uint32_t)(255.0f * c.g) << 8;
+		abgr |= (uint32_t)(255.0f * c.r);
+
+		return abgr;
+	}
+
+	//-----------------------------------------------------------------------------
+	inline uint32_t to_rgba(const Color4& c)
+	{
+		uint32_t rgba;
+
+		rgba =	(uint32_t)(255.0f * c.r) << 24;
+		rgba |= (uint32_t)(255.0f * c.g) << 16;
+		rgba |= (uint32_t)(255.0f * c.b) << 8;
+		rgba |= (uint32_t)(255.0f * c.a);
+
+		return rgba;
+	}
+
+	//-----------------------------------------------------------------------------
+	inline uint32_t to_abgr(const Color4& c)
+	{
+		uint32_t abgr;
+
+		abgr =	(uint32_t)(255.0f * c.a) << 24;
+		abgr |= (uint32_t)(255.0f * c.b) << 16;
+		abgr |= (uint32_t)(255.0f * c.g) << 8;
+		abgr |= (uint32_t)(255.0f * c.r);
+
+		return abgr;
+	}
+
+	//-----------------------------------------------------------------------------
+	inline float* to_float_ptr(Color4& c)
+	{
+		return &c.r;
+	}
+
+	//-----------------------------------------------------------------------------
+	inline const float* to_float_ptr(const Color4& c)
+	{
+		return &c.r;
+	}
+} // namespace color4
 
 //-----------------------------------------------------------------------------
-inline float* Color4::to_float_ptr()
+inline Color4::Color4()
 {
-	return &r;
+	// Do not initialize
 }
 
 //-----------------------------------------------------------------------------
-inline const float* Color4::to_float_ptr() const
+inline Color4::Color4(float r, float g, float b)
+	: r(r), g(g), b(b), a(1)
 {
-	return &r;
 }
 
 //-----------------------------------------------------------------------------
-inline uint32_t Color4::to_rgb() const
+inline Color4::Color4(int r, int g, int b)
+	: r(r * math::ONE_OVER_255)
+	, g(g * math::ONE_OVER_255)
+	, b(b * math::ONE_OVER_255)
+	, a(1)
 {
-	uint32_t rgba;
-
-	rgba =	(uint32_t)(255.0f * r) << 24;
-	rgba |= (uint32_t)(255.0f * g) << 16;
-	rgba |= (uint32_t)(255.0f * b) << 8;
-	rgba |= 255;
-
-	return rgba;
 }
 
 //-----------------------------------------------------------------------------
-inline uint32_t Color4::to_bgr() const
+inline Color4::Color4(float r, float g, float b, float a)
 {
-	uint32_t abgr;
-
-	abgr =	255 << 24;
-	abgr |= (uint32_t)(255.0f * b) << 16;
-	abgr |= (uint32_t)(255.0f * g) << 8;
-	abgr |= (uint32_t)(255.0f * r);
-
-	return abgr;
+	this->r = r;
+	this->g = g;
+	this->b = b;
+	this->a = a;
 }
 
 //-----------------------------------------------------------------------------
-inline uint32_t Color4::to_rgba() const
+inline Color4::Color4(int r, int g, int b, int a)
+	: r(r * math::ONE_OVER_255)
+	, g(g * math::ONE_OVER_255)
+	, b(b * math::ONE_OVER_255)
+	, a(a * math::ONE_OVER_255)
 {
-	uint32_t rgba;
-
-	rgba =	(uint32_t)(255.0f * r) << 24;
-	rgba |= (uint32_t)(255.0f * g) << 16;
-	rgba |= (uint32_t)(255.0f * b) << 8;
-	rgba |= (uint32_t)(255.0f * a);
-
-	return rgba;
 }
 
 //-----------------------------------------------------------------------------
-inline uint32_t Color4::to_abgr() const
+inline Color4::Color4(float c[4])
+	: r(c[0])
+	, g(c[1])
+	, b(c[2])
+	, a(c[3])
 {
-	uint32_t abgr;
-
-	abgr =	(uint32_t)(255.0f * a) << 24;
-	abgr |= (uint32_t)(255.0f * b) << 16;
-	abgr |= (uint32_t)(255.0f * g) << 8;
-	abgr |= (uint32_t)(255.0f * r);
-
-	return abgr;
 }
 
 //-----------------------------------------------------------------------------
-inline float Color4::operator[](uint32_t i) const
+inline Color4::Color4(uint32_t rgba)
+	: r(math::ONE_OVER_255 * ((rgba & 0xFF000000) >> 24))
+	, g(math::ONE_OVER_255 * ((rgba & 0x00FF0000) >> 16))
+	, b(math::ONE_OVER_255 * ((rgba & 0x0000FF00) >> 8))
+	, a(math::ONE_OVER_255 * (rgba & 0x000000FF))
 {
-	return (&r)[i];
 }
 
 //-----------------------------------------------------------------------------
@@ -394,9 +397,9 @@ inline float& Color4::operator[](uint32_t i)
 }
 
 //-----------------------------------------------------------------------------
-inline Color4 Color4::operator+(const Color4& c) const
+inline const float& Color4::operator[](uint32_t i) const
 {
-	return Color4(r + c.r, g + c.g, b + c.b, a + c.a);
+	return (&r)[i];
 }
 
 //-----------------------------------------------------------------------------
@@ -410,34 +413,17 @@ inline Color4& Color4::operator+=(const Color4& c)
 	return *this;
 }
 
-//-----------------------------------------------------------------------------
-inline Color4 Color4::operator-(const Color4& c) const
-{
-	Color4 tmp;
-
-	tmp.r = r - c.r;
-	tmp.g = g - c.g;
-	tmp.b = b - c.b;
-
-	return tmp;
-}
-
 //-----------------------------------------------------------------------------
 inline Color4& Color4::operator-=(const Color4& c)
 {
 	r -= c.r;
 	g -= c.g;
 	b -= c.b;
+	a -= c.a;
 
 	return *this;
 }
 
-//-----------------------------------------------------------------------------
-inline Color4 Color4::operator*(const Color4& c) const
-{
-	return Color4(r * c.r, g * c.g, b * c.b, a * c.a);
-}
-
 //-----------------------------------------------------------------------------
 inline Color4& Color4::operator*=(const Color4& c)
 {
@@ -450,39 +436,14 @@ inline Color4& Color4::operator*=(const Color4& c)
 }
 
 //-----------------------------------------------------------------------------
-inline Color4 Color4::operator*(float scalar) const
-{
-	return Color4(r * scalar, g * scalar, b * scalar, a * scalar);
-}
-
-//-----------------------------------------------------------------------------
-inline Color4& Color4::operator*=(float scalar)
+inline Color4& Color4::operator*=(float k)
 {
-	r *= scalar;
-	g *= scalar;
-	b *= scalar;
-	a *= scalar;
+	r *= k;
+	g *= k;
+	b *= k;
+	a *= k;
 
 	return *this;
 }
 
-//-----------------------------------------------------------------------------
-inline bool Color4::operator==(const Color4& other) const
-{
-	return (r == other.r && g == other.g && b == other.b && a == other.a);
-}
-
-//-----------------------------------------------------------------------------
-inline bool Color4::operator!=(const Color4& other) const
-{
-	return (r != other.r || g != other.g || b != other.b || a != other.a);
-}
-
-//-----------------------------------------------------------------------------
-inline Color4 operator*(float scalar, const Color4& color)
-{
-	return Color4(color.r * scalar, color.g * scalar, color.b * scalar, color.a * scalar);
-}
-
 } // namespace crown
-