peter
/
gb
1
0
Fork 0
Code Projects Releases Wiki Activity

Handle Spaces now!!!!

This commit is contained in:
gingerBill 2016-04-26 20:28:33 +01:00
parent 7db25d82b8
commit 0947bc1a50
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gb_gl.h
View File

@ -551,7 +551,12 @@ GBGL_DEF f32 gbgl_get_string_width (gbglFont *font
#endif #endif
#ifndef GBGL_FONT_CHAR_LIST #ifndef GBGL_FONT_CHAR_LIST
#define GBGL_FONT_CHAR_LIST "Āā㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľŁłŃńŅņņŇňʼnŊŋŌōōŎŏŐőŒœŕŖŗŘřŚśŜŝŞşŠšŢţŤťŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽža!ö\"#$%%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~Šš?ŒœŸÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõøùúûüýþÿ®™" #define GBGL_FONT_CHAR_LIST \
"Āā㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľŁłŃńŅņņŇňʼnŊŋ"\
"ŌōōŎŏŐőŒœŕŖŗŘřŚśŜŝŞşŠšŢţŤťŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽža!ö"\
"\"#$%%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"\
"Šš?ŒœŸÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõøùúûüýþÿ®™"\
" \t\r\n"
#endif #endif
#ifndef GBGL_PT_TO_PX_SCALE #ifndef GBGL_PT_TO_PX_SCALE
@ -2203,20 +2208,24 @@ gbgl_bs_draw_substring(gbglBasicState *bs, gbglFont *font, i32 x, i32 y, gbColou
if (ptr - str > len) if (ptr - str > len)
break; break;
if (cp == '\t') {
draw_this_glyph_count = GBGL_TAB_CHARACTER_WIDTH;
cp = ' '; // TODO(bill): Set tab to be space
}
gi = gbgl_get_glyph_info(font, cp, &curr_index); gi = gbgl_get_glyph_info(font, cp, &curr_index);
if (!gi) { if (!gi) {
gi = gbgl_get_glyph_info(font, ' ', &curr_index); gi = gbgl_get_glyph_info(font, ' ', &curr_index);
} }
if (cp == '\t')
draw_this_glyph_count = GBGL_TAB_CHARACTER_WIDTH;
if (gi) { if (gi) {
for (j = 0; j < draw_this_glyph_count; j++) { for (j = 0; j < draw_this_glyph_count; j++) {
f32 s0, t0, s1, t1; f32 s0, t0, s1, t1;
f32 x0, y0, x1, y1; f32 x0, y0, x1, y1;
f32 kern = 0.0f; f32 kern = 0.0f;
if (cp == '\r' || cp == '\n' || if (cp == '\r' || cp == '\n' ||
(max_width > 0 && px - ox + gi->xadv >= max_width32)) { (max_width > 0 && px - ox + gi->xadv >= max_width32)) {
px = ox; px = ox;