From c9598592ec6264cda1cdec8d53856ea9f71ea50d Mon Sep 17 00:00:00 2001 From: olikraus Date: Tue, 9 Aug 2016 23:22:00 +0200 Subject: [PATCH] issue #41 --- ChangeLog | 3 +- cppsrc/U8x8lib.h | 9 +++ csrc/u8x8.h | 3 + csrc/u8x8_8x8.c | 138 ++++++++++++++++++++++++++++++++- sys/sdl/hello_world_8x8/main.c | 13 ++-- 5 files changed, 158 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce29c3e9..ddef3cc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ https://github.com/olikraus/u8g2 ChangeLog * Added several fonts from http://int10h.org/oldschool-pc-fonts/ * Added Arabic, Greek and Cyrillic fonts. * Code cleanup (assert, spi modes, void * warning) - +2016-xx-xx v2.2.5 olikraus@gmail.com + * U8x8: Upscale by 2 (Issue 41) diff --git a/cppsrc/U8x8lib.h b/cppsrc/U8x8lib.h index c2468752..bd370aef 100644 --- a/cppsrc/U8x8lib.h +++ b/cppsrc/U8x8lib.h @@ -162,11 +162,20 @@ class U8X8 : public Print void drawGlyph(uint8_t x, uint8_t y, uint8_t encoding) { u8x8_DrawGlyph(&u8x8, x, y, encoding); } + void draw2x2Glyph(uint8_t x, uint8_t y, uint8_t encoding) { + u8x8_Draw2x2Glyph(&u8x8, x, y, encoding); } + void drawString(uint8_t x, uint8_t y, const char *s) { u8x8_DrawString(&u8x8, x, y, s); } void drawUTF8(uint8_t x, uint8_t y, const char *s) { u8x8_DrawUTF8(&u8x8, x, y, s); } + + void draw2x2String(uint8_t x, uint8_t y, const char *s) { + u8x8_Draw2x2String(&u8x8, x, y, s); } + + void draw2x2UTF8(uint8_t x, uint8_t y, const char *s) { + u8x8_Draw2x2UTF8(&u8x8, x, y, s); } uint8_t getUTF8Len(const char *s) { return u8x8_GetUTF8Len(&u8x8, s); } diff --git a/csrc/u8x8.h b/csrc/u8x8.h index e89d7cfb..277a5c42 100644 --- a/csrc/u8x8.h +++ b/csrc/u8x8.h @@ -697,8 +697,11 @@ uint16_t u8x8_utf8_next(u8x8_t *u8x8, uint8_t b); void u8x8_SetFont(u8x8_t *u8x8, const uint8_t *font_8x8); void u8x8_DrawGlyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding); +void u8x8_Draw2x2Glyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding); uint8_t u8x8_DrawString(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s); uint8_t u8x8_DrawUTF8(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s); /* return number of glyps */ +uint8_t u8x8_Draw2x2String(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s); +uint8_t u8x8_Draw2x2UTF8(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s); uint8_t u8x8_GetUTF8Len(u8x8_t *u8x8, const char *s); #define u8x8_SetInverseFont(u8x8, b) (u8x8)->is_font_inverse_mode = (b) diff --git a/csrc/u8x8_8x8.c b/csrc/u8x8_8x8.c index e9a63d75..1e554607 100644 --- a/csrc/u8x8_8x8.c +++ b/csrc/u8x8_8x8.c @@ -45,14 +45,21 @@ void u8x8_SetFont(u8x8_t *u8x8, const uint8_t *font_8x8) u8x8->font = font_8x8; } -void u8x8_DrawGlyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding) +/* + Args: + u8x8: ptr to u8x8 structure + encoding: glyph for which the data is requested (must be between 0 and 255) + buf: pointer to 8 bytes +*/ +static void u8x8_get_glyph_data(u8x8_t *u8x8, uint8_t encoding, uint8_t *buf) U8X8_NOINLINE; +static void u8x8_get_glyph_data(u8x8_t *u8x8, uint8_t encoding, uint8_t *buf) { uint8_t first, last, i; - uint8_t buf[8]; uint16_t offset; first = u8x8_pgm_read(u8x8->font+0); last = u8x8_pgm_read(u8x8->font+1); + /* get the glyph bitmap from the font */ if ( first <= encoding && encoding <= last ) { offset = encoding; @@ -72,6 +79,8 @@ void u8x8_DrawGlyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding) buf[i] = 0; } } + + /* invert the bitmap if required */ if ( u8x8->is_font_inverse_mode ) { for( i = 0; i < 8; i++ ) @@ -79,9 +88,95 @@ void u8x8_DrawGlyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding) buf[i] ^= 255; } } + +} + +void u8x8_DrawGlyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding) +{ + uint8_t buf[8]; + u8x8_get_glyph_data(u8x8, encoding, buf); u8x8_DrawTile(u8x8, x, y, 1, buf); } + +/* + Source: http://graphics.stanford.edu/~seander/bithacks.html + Section: Interleave bits by Binary Magic Numbers + Original codes is here: + static const unsigned int B[] = {0x55555555, 0x33333333, 0x0F0F0F0F, 0x00FF00FF}; + static const unsigned int S[] = {1, 2, 4, 8}; + + unsigned int x; // Interleave lower 16 bits of x and y, so the bits of x + unsigned int y; // are in the even positions and bits from y in the odd; + unsigned int z; // z gets the resulting 32-bit Morton Number. + // x and y must initially be less than 65536. + + x = (x | (x << S[3])) & B[3]; + x = (x | (x << S[2])) & B[2]; + x = (x | (x << S[1])) & B[1]; + x = (x | (x << S[0])) & B[0]; + + y = (y | (y << S[3])) & B[3]; + y = (y | (y << S[2])) & B[2]; + y = (y | (y << S[1])) & B[1]; + y = (y | (y << S[0])) & B[0]; + + z = x | (y << 1); +*/ +static uint16_t u8x8_upscale_byte(uint8_t x) +{ + uint16_t y = x; + y |= (y << 4); // x = (x | (x << S[2])) & B[2]; + y &= 0x0f0f; + y |= (y << 2); // x = (x | (x << S[1])) & B[1]; + y &= 0x3333; + y |= (y << 1); // x = (x | (x << S[0])) & B[0]; + y &= 0x5555; + + y |= (y << 1); // z = x | (y << 1); + return y; +} + +static void u8x8_upscale_buf(uint8_t *src, uint8_t *dest) U8X8_NOINLINE; +static void u8x8_upscale_buf(uint8_t *src, uint8_t *dest) +{ + uint8_t i = 4; + do + { + *dest++ = *src; + *dest++ = *src++; + i--; + } while( i > 0 ); +} + +void u8x8_Draw2x2Glyph(u8x8_t *u8x8, uint8_t x, uint8_t y, uint8_t encoding) +{ + uint8_t i; + uint16_t t; + uint8_t buf[8]; + uint8_t buf1[8]; + uint8_t buf2[8]; + u8x8_get_glyph_data(u8x8, encoding, buf); + for( i = 0; i < 8; i ++ ) + { + t = u8x8_upscale_byte(buf[i]); + buf1[i] = t >> 8; + buf2[i] = t & 255; + } + u8x8_upscale_buf(buf2, buf); + u8x8_DrawTile(u8x8, x, y, 1, buf); + + u8x8_upscale_buf(buf2+4, buf); + u8x8_DrawTile(u8x8, x+1, y, 1, buf); + + u8x8_upscale_buf(buf1, buf); + u8x8_DrawTile(u8x8, x, y+1, 1, buf); + + u8x8_upscale_buf(buf1+4, buf); + u8x8_DrawTile(u8x8, x+1, y+1, 1, buf); +} + + /* source: https://en.wikipedia.org/wiki/UTF-8 Bits from to bytes Byte 1 Byte 2 Byte 3 Byte 4 Byte 5 Byte 6 @@ -204,6 +299,45 @@ uint8_t u8x8_DrawUTF8(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s) return u8x8_draw_string(u8x8, x, y, s); } + + +static uint8_t u8x8_draw_2x2_string(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s) U8X8_NOINLINE; +static uint8_t u8x8_draw_2x2_string(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s) +{ + uint16_t e; + uint8_t cnt = 0; + u8x8_utf8_init(u8x8); + for(;;) + { + e = u8x8->next_cb(u8x8, (uint8_t)*s); + if ( e == 0x0ffff ) + break; + s++; + if ( e != 0x0fffe ) + { + u8x8_Draw2x2Glyph(u8x8, x, y, e); + x+=2; + cnt++; + } + } + return cnt; +} + + +uint8_t u8x8_Draw2x2String(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s) +{ + u8x8->next_cb = u8x8_ascii_next; + return u8x8_draw_2x2_string(u8x8, x, y, s); +} + +uint8_t u8x8_Draw2x2UTF8(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s) +{ + u8x8->next_cb = u8x8_utf8_next; + return u8x8_draw_2x2_string(u8x8, x, y, s); +} + + + uint8_t u8x8_GetUTF8Len(u8x8_t *u8x8, const char *s) { uint16_t e; diff --git a/sys/sdl/hello_world_8x8/main.c b/sys/sdl/hello_world_8x8/main.c index 8456206d..b3bf02cd 100644 --- a/sys/sdl/hello_world_8x8/main.c +++ b/sys/sdl/hello_world_8x8/main.c @@ -1,16 +1,19 @@ #include "u8x8.h" -u8x8_t u8g2; +u8x8_t u8x8; int main(void) { - u8x8_Setup_SDL_128x64(&u8g2); - u8x8_InitDisplay(&u8g2); + u8x8_Setup_SDL_128x64(&u8x8); + u8x8_InitDisplay(&u8x8); - u8x8_SetFont(&u8g2, u8x8_font_amstrad_cpc_extended_f); + u8x8_SetFont(&u8x8, u8x8_font_amstrad_cpc_extended_f); - u8x8_DrawString(&u8g2, 0, 0, "Hello World!"); + u8x8_DrawString(&u8x8, 0, 0, "Hello World!"); + + u8x8_Draw2x2String(&u8x8, 0, 3, "Hello World!"); + while( u8g_sdl_get_key() < 0 ) ;