From a74fd294252bbd4b0a85cdbba3a929da427c0827 Mon Sep 17 00:00:00 2001
From: unodgs <unodgs@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 17 Jul 2013 18:03:35 +0000
Subject: [PATCH] Core: Added alpha to Color (only for opengl)

git-svn-id: svn://ultimatepp.org/upp/trunk@6197 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Color.cpp |  9 ++++++++-
 uppsrc/Core/Color.h   | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/uppsrc/Core/Color.cpp b/uppsrc/Core/Color.cpp
index 7c92a0a4b..1e1ac1804 100644
--- a/uppsrc/Core/Color.cpp
+++ b/uppsrc/Core/Color.cpp
@@ -70,12 +70,19 @@ Color::operator RGBA() const
 {
 	RGBA color;
 	if(IsNullInstance())
+	{
 		Zero(color);
+		#if defined(flagWINGL) || defined(flagLINUXGL)
+		color.a = 255;
+		#endif
+	}
 	else {
 		color.r = GetR();
 		color.g = GetG();
 		color.b = GetB();
-		color.a = 255;
+		#if defined(flagWINGL) || defined(flagLINUXGL)
+		color.a = alpha;
+		#endif
 	}
 	return color;
 }
diff --git a/uppsrc/Core/Color.h b/uppsrc/Core/Color.h
index 4784b8ff3..a68c85ada 100644
--- a/uppsrc/Core/Color.h
+++ b/uppsrc/Core/Color.h
@@ -31,6 +31,9 @@ const int COLOR_V = 39;
 class Color : public ValueType<Color, COLOR_V, Moveable<Color> > {
 protected:
 	dword    color;
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	byte     alpha;
+	#endif
 
 	dword Get() const;
 
@@ -40,8 +43,15 @@ public:
 	int      GetR() const              { return GetRValue(Get()); }
 	int      GetG() const              { return GetGValue(Get()); }
 	int      GetB() const              { return GetBValue(Get()); }
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	int      GetA() const              { return alpha; }
+	#endif
 
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	void     SetNull()                 { color = 0xffffffff; alpha = 255; }
+	#else
 	void     SetNull()                 { color = 0xffffffff; }
+	#endif
 	bool     IsNullInstance() const    { return color == 0xffffffff; }
 	unsigned GetHashValue() const      { return color; }
 	bool     operator==(Color c) const { return color == c.color; }
@@ -52,24 +62,43 @@ public:
 	void     Xmlize(XmlIO& xio);
 
 	Color()                            { SetNull(); }
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	Color(int r, int g, int b)         { color = RGB(r, g, b); alpha = 255; }
+	Color(int r, int g, int b, int a)  { color = RGB(r, g, b); alpha = (byte) a; }
+	Color(int n, int)                  { color = 0x80000000 | n; alpha = 255;}
+	#else
 	Color(int r, int g, int b)         { color = RGB(r, g, b); }
 	Color(int n, int)                  { color = 0x80000000 | n; }
+	#endif
 
 	Color(const Nuller&)               { SetNull(); }
 
 	operator Value() const             { return SvoToValue(*this); }
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	Color(const Value& q)              { Color c = q.Get<Color>(); color = c.color; alpha = c.alpha; }
+	#else
 	Color(const Value& q)              { color = q.Get<Color>().color; }
-
+	#endif
+	
 	operator RGBA() const;
 	Color(RGBA rgba);
 
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	Color(Color (*fn)())               { color = (*fn)().color; alpha = 255; }
+	static Color FromRaw(dword co)     { Color c; c.color = co; c.alpha = 255; return c; }
+	Color& Alpha(byte a)               { alpha = a; return *this; }
+	#else
 	Color(Color (*fn)())               { color = (*fn)().color; }
-
 	static Color FromRaw(dword co)     { Color c; c.color = co; return c; }
-
+	#endif
+	
 #ifdef PLATFORM_WIN32
 	operator COLORREF() const          { return (COLORREF) Get(); }
+	#if defined(flagWINGL) || defined(flagLINUXGL)
+	static  Color FromCR(COLORREF cr)  { Color c; c.color = (dword)cr; c.alpha = 255; return c; }
+	#else
 	static  Color FromCR(COLORREF cr)  { Color c; c.color = (dword)cr; return c; }
+	#endif
 #else
 	operator dword() const             { return Get(); }
 #endif