drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/core] Cleanup color channel conversion

Browse Source
This commit is contained in:
Gary Talent 2019-12-31 17:34:34 -06:00
parent bd1fc01ca1
commit 2049931937
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nostalgia/core/gfx.cpp
View File

@ -141,37 +141,37 @@ static char charMap[128] = {
0, // ~ 0, // ~
}; };
Color32 toColor32(Color16 nc) { Color32 toColor32(Color16 nc) noexcept {
auto r = ((nc & 0b0000000000011111) >> 0) * 8; Color32 r = ((nc & 0b0000000000011111) >> 0) * 8;
auto g = ((nc & 0b0000001111100000) >> 5) * 8; Color32 g = ((nc & 0b0000001111100000) >> 5) * 8;
auto b = ((nc & 0b0111110000000000) >> 10) * 8; Color32 b = ((nc & 0b0111110000000000) >> 10) * 8;
auto a = 255; Color32 a = 255;
return a | (b << 8) | (g << 16) | (r << 24); return a | (b << 8) | (g << 16) | (r << 24);
} }
uint8_t red32(Color32 c) { uint8_t red32(Color32 c) noexcept {
return (c & 0x000000ff) >> 0; return (c & 0x000000ff) >> 0;
} }
uint8_t green32(Color32 c) { uint8_t green32(Color32 c) noexcept {
return (c & 0x0000ff00) >> 8; return (c & 0x0000ff00) >> 8;
} }
uint8_t blue32(Color32 c) { uint8_t blue32(Color32 c) noexcept {
return (c & 0x00ff0000) >> 16; return (c & 0x00ff0000) >> 16;
} }
uint8_t red32(Color16 c) { uint8_t red32(Color16 c) noexcept {
return ((c & 0b0000000000011111) >> 0) * 8; return ((c & 0b0000000000011111) >> 0) * 8;
} }
uint8_t green32(Color16 c) { uint8_t green32(Color16 c) noexcept {
return ((c & 0b0000001111100000) >> 5) * 8; return ((c & 0b0000001111100000) >> 5) * 8;
} }
uint8_t blue32(Color16 c) { uint8_t blue32(Color16 c) noexcept {
return ((c & 0b0111110000000000) >> 10) * 8; return ((c & 0b0111110000000000) >> 10) * 8;
} }

14
src/nostalgia/core/gfx.hpp
View File

@ -69,20 +69,20 @@ ox::Error model(T *io, NostalgiaGraphic *ng) {
*/ */
[[nodiscard]] ox::Error loadTileSheet(Context *ctx, TileSheetSpace tss, int section, ox::FileAddress tilesheet, ox::FileAddress palette = nullptr); [[nodiscard]] ox::Error loadTileSheet(Context *ctx, TileSheetSpace tss, int section, ox::FileAddress tilesheet, ox::FileAddress palette = nullptr);
[[nodiscard]] Color32 toColor32(Color16 nc); [[nodiscard]] Color32 toColor32(Color16 nc) noexcept;
[[nodiscard]] uint8_t red32(Color16 c); [[nodiscard]] uint8_t red32(Color16 c) noexcept;
[[nodiscard]] uint8_t green32(Color16 c); [[nodiscard]] uint8_t green32(Color16 c) noexcept;
[[nodiscard]] uint8_t blue32(Color16 c); [[nodiscard]] uint8_t blue32(Color16 c) noexcept;
[[nodiscard]] uint8_t red32(Color32 c); [[nodiscard]] uint8_t red32(Color32 c) noexcept;
[[nodiscard]] uint8_t green32(Color32 c); [[nodiscard]] uint8_t green32(Color32 c) noexcept;
[[nodiscard]] uint8_t blue32(Color32 c); [[nodiscard]] uint8_t blue32(Color32 c) noexcept;
void puts(Context *ctx, int column, int row, const char *str); void puts(Context *ctx, int column, int row, const char *str);