ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix invaders font, simple patch to spaceinvaders.c to see if it renders ok

This commit is contained in:
Stefan `Sec` Zehl 2011-07-05 15:48:26 +02:00
parent 8113cd8931
commit 70bf904c1c
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/applications/spaceinvaders.c
View File

@ -184,11 +184,13 @@ void draw_status() {
void draw_sprite(char x, char y) { void draw_sprite(char x, char y) {
for (int dx=0; dx<8; dx++){ font = &Font_Invaders;
DoString(x,y-1,"C");
/* for (int dx=0; dx<8; dx++){
for(int dy=0; dy<8; dy++){ for(int dy=0; dy<8; dy++){
lcdSetPixel(x+dx,y+dy, true); lcdSetPixel(x+dx,y+dy, true);
} }
} } */
} }
void check_end() { void check_end() {

15
firmware/lcd/fonts/invaders.c
View File

@ -40,7 +40,7 @@ const uint8_t InvadersBitmaps[] = {
0x9c, /* * *** */ 0x9c, /* * *** */
/* Char 67 is 8px wide @ 29 */ /* Char 67 is 9px wide @ 29 */
0xff, 0, 0, /* rawmode, preblank, postblank */ 0xff, 0, 0, /* rawmode, preblank, postblank */
0x58, /* * ** */ 0x58, /* * ** */
0xbc, /* * **** */ 0xbc, /* * **** */
@ -50,9 +50,10 @@ const uint8_t InvadersBitmaps[] = {
0x36, /* ** ** */ 0x36, /* ** ** */
0x1c, /* *** */ 0x1c, /* *** */
0xb8, /* * *** */ 0xb8, /* * *** */
0x40, /* * */
/* Char 85 is 16px wide @ 40 */ /* Char 85 is 16px wide @ 41 */
0xff, 0, 0, /* rawmode, preblank, postblank */ 0xff, 0, 0, /* rawmode, preblank, postblank */
0x20, /* * */ 0x20, /* * */
0x30, /* ** */ 0x30, /* ** */
@ -72,7 +73,7 @@ const uint8_t InvadersBitmaps[] = {
0x20, /* * */ 0x20, /* * */
/* Char 97 is 11px wide @ 59 */ /* Char 97 is 11px wide @ 60 */
0xff, 0, 0, /* rawmode, preblank, postblank */ 0xff, 0, 0, /* rawmode, preblank, postblank */
0x9e, /* * **** */ 0x9e, /* * **** */
0x38, /* *** */ 0x38, /* *** */
@ -87,7 +88,7 @@ const uint8_t InvadersBitmaps[] = {
0x9e, /* * **** */ 0x9e, /* * **** */
/* Char 98 is 12px wide @ 73 */ /* Char 98 is 12px wide @ 74 */
0xff, 0, 0, /* rawmode, preblank, postblank */ 0xff, 0, 0, /* rawmode, preblank, postblank */
0x1c, /* *** */ 0x1c, /* *** */
0x5e, /* * **** */ 0x5e, /* * **** */
@ -103,7 +104,7 @@ const uint8_t InvadersBitmaps[] = {
0x1c, /* *** */ 0x1c, /* *** */
/* Char 99 is 8px wide @ 88 */ /* Char 99 is 8px wide @ 89 */
0xff, 0, 0, /* rawmode, preblank, postblank */ 0xff, 0, 0, /* rawmode, preblank, postblank */
0x98, /* * ** */ 0x98, /* * ** */
0x5c, /* * *** */ 0x5c, /* * *** */
@ -121,7 +122,7 @@ const uint8_t InvadersBitmaps[] = {
const FONT_CHAR_INFO InvadersLengths[] = { const FONT_CHAR_INFO InvadersLengths[] = {
{14}, /* A */ {14}, /* A */
{15}, /* B */ {15}, /* B */
{11}, /* C */ {12}, /* C */
{19}, /* U */ {19}, /* U */
{14}, /* a */ {14}, /* a */
{15}, /* b */ {15}, /* b */
@ -145,5 +146,5 @@ const struct FONT_DEF Font_Invaders = {
* Name: Invaders * Name: Invaders
* Height: 8 px (1 bytes) * Height: 8 px (1 bytes)
* Maximum width: 16 px * Maximum width: 16 px
* Storage size: 106 bytes (compressed by -24%) * Storage size: 107 bytes (compressed by -24%)
*/ */

10
tools/font/bdf/invaders.xbdf
View File

@ -41,11 +41,11 @@ ENDCHAR
STARTCHAR alien3-1 STARTCHAR alien3-1
ENCODING 67 ENCODING 67
XBITMAP XBITMAP
...xx... ...xx....
..xxxx.. ..xxxx...
.xxxxxx. .xxxxxx..
xx.xx.xx xx.xx.xx.
xxxxxxxx xxxxxxxx.
.x.xxx.x. .x.xxx.x.
x.......x x.......x
.x.....x. .x.....x.