XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

2048:

Browse Source 
- scale 2x for tile font
TODO:
 - optimize tile drawing: maybe separate canvas for every tile

git-svn-id: svn://kolibrios.org@5252 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
raandoom 2014-12-20 22:37:13 +00:00
parent 3e8f7a119c
commit d0d970922e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/games/2048/paint.c
View File

@ -71,9 +71,6 @@ void canvas_draw_rect(rect *r, __u32 color)
void canvas_draw_text(rect* r, char* txt, __u32 len, __u32 color) void canvas_draw_text(rect* r, char* txt, __u32 len, __u32 color)
{ {
__u16 x = r->x + (r->width - len * FONT_WIDTH - len) / 2 - canvas.area.x;
__u16 y = r->y + (r->height - FONT_HEIGHT) / 2 - canvas.area.y;
__u32 w; __u32 w;
__u32 h; __u32 h;
char* mem; char* mem;
@ -94,6 +91,9 @@ void canvas_draw_text(rect* r, char* txt, __u32 len, __u32 color)
"S"(len), "S"(len),
"D"((__u32)(mem))); "D"((__u32)(mem)));
__u16 x = r->x + (r->width - (len * FONT_WIDTH + len) * 2) / 2 - canvas.area.x;
__u16 y = r->y + (r->height - FONT_HEIGHT * 2) / 2 - canvas.area.y;
int row = 0; int row = 0;
int column = 0; int column = 0;
__u32* __mem = (__u32*)(mem + 8); __u32* __mem = (__u32*)(mem + 8);
@ -104,7 +104,11 @@ void canvas_draw_text(rect* r, char* txt, __u32 len, __u32 color)
__u32 c = __mem[column + row * w]; __u32 c = __mem[column + row * w];
if (c & 0xFF000000) if (c & 0xFF000000)
{ {
canvas.image[canvas_index(row + y,column + x)] = *((rgb*)&c); canvas.image[canvas_index(row * 2 + y,column * 2 + x)] = *((rgb*)&c);
canvas.image[canvas_index(row * 2 + y,column * 2 + 1 + x)] = *((rgb*)&c);
canvas.image[canvas_index(row * 2 + 1 + y,column * 2 + x)] = *((rgb*)&c);
canvas.image[canvas_index(row * 2 + 1 + y,column * 2 + 1 + x)] = *((rgb*)&c);
} }
} }
} }