mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculate exact image size in GenImageFontAtlas (#2963)

Browse Source 
* Calculate exact image size in GenImageFontAtlas

Calculate exact image size with a method based on total glyph width and glyph row count
Current method seemed a little bit overkill with square root, log and power functions and only approximates image size which can be wonky with some weird fonts like cursive fonts.
Proposed method calculates image size directly with a simpler method and results exact image size needed.

* Update rtext.c

* Update rtext.c

Changed do-while to while loop, and also added an extra step to calculate maximum glyph width and excluding it from image width for extra safety.
This commit is contained in:
Hanaxar 2023-03-22 12:59:28 +03:00 committed by GitHub
parent 7565e274b1
commit 02a8a49961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rtext.c
View File

@ -694,14 +694,19 @@ Image GenImageFontAtlas(const GlyphInfo *chars, Rectangle **charRecs, int glyphC
// NOTE: Rectangles memory is loaded here! // NOTE: Rectangles memory is loaded here!
Rectangle *recs = (Rectangle *)RL_MALLOC(glyphCount*sizeof(Rectangle)); Rectangle *recs = (Rectangle *)RL_MALLOC(glyphCount*sizeof(Rectangle));
// Calculate image size based on required pixel area // Calculate image size based on total glyph width and glyph row count
// NOTE 1: Image is forced to be squared and POT... very conservative! int totalWidth = 0, maxGlyphWidth = 0;
// NOTE 2: SDF font characters already contain an internal padding, for (int i = 0; i < glyphCount; i++)
// so image size would result bigger than default font type {
float requiredArea = 0; if (chars[i].image.width > maxGlyphWidth) maxGlyphWidth = chars[i].image.width;
for (int i = 0; i < glyphCount; i++) requiredArea += ((chars[i].image.width + 2*padding)*(fontSize + 2*padding)); totalWidth += chars[i].image.width + 2*padding;
float guessSize = sqrtf(requiredArea)*1.4f; }
int imageSize = (int)powf(2, ceilf(logf((float)guessSize)/logf(2))); // Calculate next POT int rowCount = 0, imageSize = 64; // A minimum starting value to avoid unnecessary calculation steps for very small images
while (totalWidth > (imageSize - maxGlyphWidth)*rowCount) // maxGlyphWidth is maximum possible space left at the end of row
{
imageSize *= 2; // Double the size of image (to keep POT)
rowCount = imageSize/(fontSize + 2*padding); // Calculate new row count for the new image size
}
atlas.width = imageSize; // Atlas bitmap width atlas.width = imageSize; // Atlas bitmap width
atlas.height = imageSize; // Atlas bitmap height atlas.height = imageSize; // Atlas bitmap height