Apple-2-HW/aiie
1
0
Fork 0
mirror of https://github.com/JorjBauer/aiie.git synced 2024-11-29 01:49:19 +00:00
Code Issues Projects Releases Wiki Activity

remove b&w from sdl layer

Browse Source
This commit is contained in:
Jorj Bauer 2021-01-17 20:45:44 -05:00
parent ecb32dd873
commit 051bfd09ca
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sdl/sdl-display.cpp
View File

@ -20,21 +20,21 @@ extern const unsigned char interface_glyphs[256];
// RGB map of each of the lowres colors // RGB map of each of the lowres colors
const uint8_t loresPixelColors[16][3] = { { 0, 0, 0 }, // black const uint8_t loresPixelColors[16][3] = { { 0, 0, 0 }, // black
{ 195, 0, 48 }, // magenta { 0xAC, 0x12, 0x4C }, // magenta
{ 0, 0, 130 }, // dark blue { 0x00, 0x07, 0x83 }, // dark blue
{ 166, 52, 170 }, // purple { 0xAA, 0x1A, 0xD1 }, // purple
{ 0, 146, 0 }, // dark green { 0x00, 0x83, 0x2F }, // dark green
{ 105, 105, 105 }, // drak grey { 0x9F, 0x97, 0x7E }, // drak grey
{ 24, 113, 255 }, // medium blue { 0x00, 0x8A, 0xB5 }, // medium blue
{ 12, 190, 235 }, // light blue { 0x9F, 0x9E, 0xFF }, // light blue
{ 150, 85, 40 }, // brown { 0x7A, 0x5F, 0x00 }, // brown
{ 255, 24, 44 }, // orange { 0xFF, 0x72, 0x47 }, // orange
{ 150, 170, 170 }, // light gray { 0x78, 0x68, 0x7F }, // light gray
{ 255, 158, 150 }, // pink { 0xFF, 0x7A, 0xCF }, // pink
{ 0, 255, 0 }, // green { 0x6F, 0xE6, 0x2C }, // green
{ 255, 255, 0 }, // yellow { 0xFF, 0xF6, 0x7B }, // yellow
{ 130, 255, 130 }, // aqua { 0x6C, 0xEE, 0xB2 }, // aqua
{ 255, 255, 255 } // white { 0xFF, 0xFF, 0xFF } // white
}; };
SDLDisplay::SDLDisplay() SDLDisplay::SDLDisplay()
@ -124,8 +124,9 @@ void SDLDisplay::blit(AiieRect r)
g = fv; g = fv;
} }
else if (g_displayType == m_blackAndWhite) { else if (g_displayType == m_blackAndWhite) {
float fv = 0.2125 * r + 0.7154 * g + 0.0721 * b; // Used to reduce to B&W in this driver, but now it's up in the apple display
r = g = b = fv; // float fv = 0.2125 * r + 0.7154 * g + 0.0721 * b;
// r = g = b = fv;
} }
SDL_SetRenderDrawColor(renderer, r, g, b, 255); SDL_SetRenderDrawColor(renderer, r, g, b, 255);