Skip to content

Fixed even more color bugs #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
H2CO3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed even more color bugs #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions graphics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,16 @@ namespace
return *((Uint32*)screen->pixels + y * screen->w + x);
}

inline void project(SDL_Surface* screen, int draw_clr, int x, int y, int val, int max)
inline void project(SDL_Surface* screen, unsigned draw_clr, int x, int y, int val, int max)
{
Uint32& pix = pixel(screen, x, y);
static const int c[] = {0, 8, 16};

#ifdef __APPLE__
static const int c[] = { 24, 16, 8 };
#else
static const int c[] = { 0, 8, 16 };
#endif

for (int i=0; i<3; ++i)
{
int col = ( ((pix >> c[i]) & 0xff) * (max-val) +
Expand Down Expand Up @@ -312,9 +318,16 @@ void genv::canvas::draw_text(const std::string& str)
}
else { // SDL_ttf
// get color from draw_clr:
#ifdef __APPLE__
int rc = (draw_clr >> 8) & 0xff,
gc = (draw_clr >> 16) & 0xff,
bc = (draw_clr >> 24) & 0xff;
#else
int rc = (draw_clr & 0xff0000) >> 16,
gc = (draw_clr & 0x00ff00) >> 8,
bc = (draw_clr & 0x0000ff);
#endif

SDL_Color text_clr = {rc, gc, bc};
SDL_Surface* t;
// render text in blended mode (AA)
Expand Down