petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r24111) -Codechange: use Colour more instead of manually bitstuffing

Browse Source
This commit is contained in:
rubidium
2012-04-10 20:16:51 +00:00
parent bf86748300
commit 54e36c4ff8
8 changed files with 95 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gfx_type.h
View File

@@ -158,8 +158,35 @@ union Colour {
uint8 b, g, r, a; ///< colour channels in LE order
#endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */
};
/**
* Create a new colour.
* @param r The channel for the red colour.
* @param g The channel for the green colour.
* @param b The channel for the blue colour.
* @param a The channel for the alpha/transparency.
*/
Colour(uint8 r, uint8 g, uint8 b, uint8 a = 0xFF) :
#if TTD_ENDIAN == TTD_BIG_ENDIAN
a(a), r(r), g(g), b(b)
#else
b(b), g(g), r(r), a(a)
#endif /* TTD_ENDIAN == TTD_BIG_ENDIAN */
{
}
/**
* Create a new colour.
* @param The colour in the correct packed format.
*/
Colour(uint data = 0) : data(data)
{
}
};
assert_compile(sizeof(Colour) == sizeof(uint32));
/** Available font sizes */
enum FontSize {
FS_NORMAL, ///< Index of the normal font in the font tables.