duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't upload glyphs with no width or height

Browse source 
The SDLTexture renderer gives annoying errors otherwise
This commit is contained in:
Clownacy 2020-11-03 13:33:32 +00:00
parent 5395196b52
commit 9e9b8942a5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Font.cpp
View file

@ -1082,7 +1082,8 @@ static Glyph* GetGlyph(Font *font, unsigned long unicode_value)
glyph->y_offset = (font->face->size->metrics.ascender + (64 / 2)) / 64 - font->face->glyph->bitmap_top; glyph->y_offset = (font->face->size->metrics.ascender + (64 / 2)) / 64 - font->face->glyph->bitmap_top;
glyph->x_advance = font->face->glyph->advance.x / 64; glyph->x_advance = font->face->glyph->advance.x / 64;
RenderBackend_UploadGlyph(font->atlas, glyph->x, glyph->y, bitmap.buffer, glyph->width, glyph->height, glyph->width); if (glyph->width != 0 && glyph->height != 0) // Some glyphs are just plain empty - don't bother trying to upload them
RenderBackend_UploadGlyph(font->atlas, glyph->x, glyph->y, bitmap.buffer, glyph->width, glyph->height, glyph->width);
FT_Bitmap_Done(font->library, &bitmap); FT_Bitmap_Done(font->library, &bitmap);
@ -1121,7 +1122,8 @@ static Glyph* GetGlyph(Font *font, unsigned long unicode_value)
glyph->y_offset = 0; glyph->y_offset = 0;
glyph->x_advance = local_glyph->x_advance; glyph->x_advance = local_glyph->x_advance;
RenderBackend_UploadGlyph(font->atlas, glyph->x, glyph->y, &font->image_buffer[local_glyph->y * font->image_buffer_width + local_glyph->x], glyph->width, glyph->height, font->image_buffer_width); if (glyph->width != 0 && glyph->height != 0) // Some glyphs are just plain empty - don't bother trying to upload them
RenderBackend_UploadGlyph(font->atlas, glyph->x, glyph->y, &font->image_buffer[local_glyph->y * font->image_buffer_width + local_glyph->x], glyph->width, glyph->height, font->image_buffer_width);
*glyph_pointer = glyph->next; *glyph_pointer = glyph->next;
glyph->next = font->glyph_list_head; glyph->next = font->glyph_list_head;