Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fixed hex colors being backwards, though in a pretty hacky way.

Browse source
This commit is contained in:
Aloshi 2012-08-15 06:05:34 -05:00
parent 9e4859e453
commit 7b1c4374ae
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Renderer_draw.cpp
View file

@ -12,14 +12,14 @@ int Renderer::fontHeight[3];
//a utility function to convert an int (usually defined as hex) to the SDL color struct //a utility function to convert an int (usually defined as hex) to the SDL color struct
SDL_Color getSDLColor(int& color) SDL_Color getSDLColor(int& int_color)
{ {
char* c = (char*)(&color); //taken off a forum post
//#if SDL_BYTEORDER == SDL_BIG_ENDIAN
SDL_Color ret; SDL_Color ret={(int_color & 0x00ff0000)/0x10000,(int_color & 0x0000ff00)/0x100,(int_color & 0x000000ff),0};
ret.r = *(c + 2); //#else
ret.g = *(c + 1); // SDL_Color ret={(int_color & 0x000000ff),(int_color & 0x0000ff00)/0x100,(int_color & 0x00ff0000)/0x10000,0};
ret.b = *(c + 0); //#endif
return ret; return ret;
} }
@ -27,6 +27,13 @@ SDL_Color getSDLColor(int& color)
void Renderer::drawRect(int x, int y, int h, int w, int color) void Renderer::drawRect(int x, int y, int h, int w, int color)
{ {
SDL_Rect rect = {x, y, h, w}; SDL_Rect rect = {x, y, h, w};
//this is really dumb - FillRect takes a uint32, everything else uses getSDLColor
//the internal ints that we use (e.g. 0x999999) are rendered wrong
//i'm really bad at bitshifting so I don't know how to do this in a more efficient way
SDL_Color conv = getSDLColor(color);
color = SDL_MapRGB(Renderer::screen->format, conv.r, conv.g, conv.b);
SDL_FillRect(Renderer::screen, &rect, color); SDL_FillRect(Renderer::screen, &rect, color);
} }