mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2024-11-28 16:58:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

use constexpr func instead of macro for hex colors

Browse Source
This commit is contained in:
Noel Berry 2023-03-05 15:59:58 -08:00
parent 53714a4ad2
commit 45a5e8839f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/blah_color.h
View File

@ -3,8 +3,6 @@
#include <blah_string.h> #include <blah_string.h>
#include <blah_spatial.h> #include <blah_spatial.h>
#define BLAH_HEX_VALUE(n) ((n >= '0' && n <= '9') ? (n - '0') : ((n >= 'A' && n <= 'F') ? (10 + n - 'A') : ((n >= 'a' && n <= 'f') ? (10 + n - 'a') : 0)))
namespace Blah namespace Blah
{ {
struct Color struct Color
@ -63,6 +61,11 @@ namespace Blah
constexpr Color(const char* hex_string) constexpr Color(const char* hex_string)
: r(0), g(0), b(0), a(255) : r(0), g(0), b(0), a(255)
{ {
constexpr auto to_hex = [](char n) constexpr
{
return ((n >= '0' && n <= '9') ? (n - '0') : ((n >= 'A' && n <= 'F') ? (10 + n - 'A') : ((n >= 'a' && n <= 'f') ? (10 + n - 'a') : 0)));
};
if (*hex_string == '#') if (*hex_string == '#')
hex_string += 1; hex_string += 1;
else if (*hex_string == '0' && (*(hex_string + 1) == 'x' || *(hex_string + 1) == 'X')) else if (*hex_string == '0' && (*(hex_string + 1) == 'x' || *(hex_string + 1) == 'X'))
@ -74,13 +77,13 @@ namespace Blah
if (len >= 6) if (len >= 6)
{ {
r = (BLAH_HEX_VALUE(hex_string[0]) << 4) + BLAH_HEX_VALUE(hex_string[1]); r = (to_hex(hex_string[0]) << 4) + to_hex(hex_string[1]);
g = (BLAH_HEX_VALUE(hex_string[2]) << 4) + BLAH_HEX_VALUE(hex_string[3]); g = (to_hex(hex_string[2]) << 4) + to_hex(hex_string[3]);
b = (BLAH_HEX_VALUE(hex_string[4]) << 4) + BLAH_HEX_VALUE(hex_string[5]); b = (to_hex(hex_string[4]) << 4) + to_hex(hex_string[5]);
} }
if (len >= 8) if (len >= 8)
a = (BLAH_HEX_VALUE(hex_string[6]) << 4) + BLAH_HEX_VALUE(hex_string[7]); a = (to_hex(hex_string[6]) << 4) + to_hex(hex_string[7]);
} }
// Premultiplies the Color // Premultiplies the Color
@ -244,5 +247,3 @@ namespace Blah
inline const Color Color::purple = Color(255, 0, 255); inline const Color Color::purple = Color(255, 0, 255);
inline const Color Color::teal = Color( 0, 255, 255); inline const Color Color::teal = Color( 0, 255, 255);
} }
#undef BLAH_HEX_VALUE