atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add capabilieties at the Color class

Browse Source
This commit is contained in:
Edouard DUPIN 2013-07-09 15:11:39 +02:00
parent 7c138de4ef
commit 6fde63610d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etk/Color.h
View File

@ -21,6 +21,7 @@ namespace etk {
MY_TYPE m_a; MY_TYPE m_a;
public : public :
Color(void) { }; Color(void) { };
Color(double _r, double _g, double _b, double _a=255) { Set((float)_r, (float)_g, (float)_b, (float)_a); };
Color(float _r, float _g, float _b, float _a=255) { Set(_r, _g, _b, _a); }; Color(float _r, float _g, float _b, float _a=255) { Set(_r, _g, _b, _a); };
Color(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a=255) { Set(_r, _g, _b, _a); }; Color(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a=255) { Set(_r, _g, _b, _a); };
Color(int _r, int _g, int _b, int _a=255) { Set(_r, _g, _b, _a); }; Color(int _r, int _g, int _b, int _a=255) { Set(_r, _g, _b, _a); };
@ -43,6 +44,26 @@ namespace etk {
m_a = _input.m_a; m_a = _input.m_a;
return *this; return *this;
}; };
bool operator!= (const etk::Color<MY_TYPE>& _obj) const
{
if( m_r != _obj.m_r
|| m_g != _obj.m_g
|| m_b != _obj.m_b
|| m_a != _obj.m_a) {
return true;
}
return false;
}
bool operator== (const etk::Color<MY_TYPE>& _obj) const
{
if( m_r != _obj.m_r
|| m_g != _obj.m_g
|| m_b != _obj.m_b
|| m_a != _obj.m_a) {
return false;
}
return true;
}
uint32_t Get(void) const; uint32_t Get(void) const;
void Set(float _r, float _g, float _b, float _a=255); void Set(float _r, float _g, float _b, float _a=255);
void Set(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a=255); void Set(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a=255);

2
etk/types.h
View File

@ -44,7 +44,7 @@
#define etk_avg(minimim,elem,maximum) (((minimim)>(elem)) ? (minimim) : ((maximum)<(elem)) ? (maximum) : (elem)) #define etk_avg(minimim,elem,maximum) (((minimim)>(elem)) ? (minimim) : ((maximum)<(elem)) ? (maximum) : (elem))
#include <etk/UniChar.h> #include <etk/UniChar.h>
#if 1 #if 0
typedef size_t esize_t; typedef size_t esize_t;
#define ESIZE_T_IS_UNSIGNED #define ESIZE_T_IS_UNSIGNED
#else #else