alema/ugui.c3l
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimize cache_get n shiet

Browse source
This commit is contained in:
Alessandro Mauri 2023-02-25 00:02:48 +01:00
parent ae8bbc0077
commit 9de467eae9
No known key found for this signature in database
GPG key ID: 2B7BF9531FF03BE8
6 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
text_rendering/ren.c
View file

@ -391,7 +391,7 @@ static int ren_draw_font_stack(void)
GL(glScissor(0, 0, ren.width, ren.height))
GL(glClear(GL_COLOR_BUFFER_BIT));
// this has caused me some trouble, convert from image coordiates to viewport
//GL(glScissor(ren.s_x, ren.height-ren.s_y-ren.s_h, ren.s_w, ren.s_h))
GL(glScissor(ren.s_x, ren.height-ren.s_y-ren.s_h, ren.s_w, ren.s_h))
GL(glUniform2i(ren.viewsize_loc, ren.width, ren.height))
GL(glUniform2i(ren.texturesize_loc, ren.font->width, ren.font->height))
@ -480,9 +480,9 @@ int ren_render_text(const char *str, int x, int y, int w, int h, int size)
uint_least32_t cp;
int updated, gx = x, gy = y;
struct v_text v;
printf("rendering text: %s\n", str);
for (off = 0; (ret = grapheme_decode_utf8(str+off, SIZE_MAX, &cp)) > 0 && cp != 0; off += ret) {
// skip special characters that render a box (not present in font)
// FIXME: handle tab
if (iscntrl(cp)) goto skip_render;
g = font_get_glyph_texture(ren.font, cp, &updated);
if (!g) REN_RET(-1, REN_FONT);
@ -531,9 +531,8 @@ int ren_render_text(const char *str, int x, int y, int w, int h, int size)
vtstack_push(&ren.font_stack, &v);
// TODO: possible kerning needs to be applied here
// FIXME: advance is too large
//gx += c.w + c.a;
//gx += c.w + c.x + 1;
// TODO: handle other unicode control characters such as the
// right-to-left isolate (\u2067)
gx += c.x + c.a;
skip_render:
switch (cp) {
@ -542,7 +541,7 @@ int ren_render_text(const char *str, int x, int y, int w, int h, int size)
break;
case '\n':
// TODO: encode and/or store line height
gy = ren.font->glyph_max_h;
gy += ren.font->glyph_max_h;
gx = x;
break;
default: break;