kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix RenderGlyph

Browse Source 
We change the way RenderGlyph populates the binary data here. It's a little heavier than the 8-bit method used previously but I was having issues getting that to work properly with `Image`.
This commit is contained in:
Chris Speciale
2024-10-28 22:51:15 -04:00
committed by GitHub
parent 802ae3518e
commit 4673b91c65
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
project/src/text/Font.cpp
View File

@@ -944,29 +944,33 @@ namespace lime {
}
int Font::RenderGlyph (int index, Bytes *bytes, int offset) {
if (FT_Load_Glyph ((FT_Face)face, index, FT_LOAD_FORCE_AUTOHINT | FT_LOAD_DEFAULT) == 0) {
if (FT_Render_Glyph (((FT_Face)face)->glyph, FT_RENDER_MODE_NORMAL) == 0) {
int Font::RenderGlyph(int index, Bytes *bytes, int offset)
{
if (FT_Load_Glyph((FT_Face)face, index, FT_LOAD_FORCE_AUTOHINT | FT_LOAD_DEFAULT) == 0)
{
if (FT_Render_Glyph(((FT_Face)face)->glyph, FT_RENDER_MODE_LCD) == 0)
{
FT_Bitmap bitmap = ((FT_Face)face)->glyph->bitmap;
int height = bitmap.rows;
int width = bitmap.width;
int width = bitmap.width / 3; //Due to each pixel now has 3 components (R, G, B)
int pitch = bitmap.pitch;
if (width == 0 || height == 0) return 0;
if (width == 0 || height == 0)
return 0;
uint32_t size = (4 * 5) + (width * height);
if (bytes->length < size + offset) {
bytes->Resize (size + offset);
//We calculate the size needed for the glyph image, including metadata and 24-bit RGB color data
uint32_t size = sizeof(GlyphImage) + (width * height * 4);
if (bytes->length < size + offset)
{
bytes->Resize(size + offset);
}
GlyphImage *data = (GlyphImage*)(bytes->b + offset);
GlyphImage *data = (GlyphImage *)(bytes->b + offset);
//We should initialize the GlyphImage struct here with zero to avoid uninitialized values
memset(data, 0, sizeof(GlyphImage));
data->index = index;
data->width = width;
@@ -974,22 +978,33 @@ namespace lime {
data->x = ((FT_Face)face)->glyph->bitmap_left;
data->y = ((FT_Face)face)->glyph->bitmap_top;
unsigned char* position = &data->data;
unsigned char *position = &data->data;
for (int i = 0; i < height; i++) {
memcpy (position + (i * width), bitmap.buffer + (i * pitch), width);
//Copy the bitmap data row by row, copying each RGB triplet and adding padding for 32-bit alignment
for (int i = 0; i < height; i++)
{
for (int j = 0; j < width; j++)
{
unsigned char r = bitmap.buffer[i * pitch + j * 3 + 0];
unsigned char g = bitmap.buffer[i * pitch + j * 3 + 1];
unsigned char b = bitmap.buffer[i * pitch + j * 3 + 2];
//Red
position[(i * width + j) * 4 + 0] = r;
//Green
position[(i * width + j) * 4 + 1] = g;
//Blue
position[(i * width + j) * 4 + 2] = b;
//Alpha (fully opaque)
position[(i * width + j) * 4 + 3] = 255;
}
}
return size;
}
}
return 0;
}