ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4ed_font_provider_freetype.cpp: Rewrote the ft__bad_rect_pack_next function. There were several issues with the previous function that didn't manifest because the default size for the font atlas is 1024 * 1024 and the default 4coder only use about 1/8 of it. 

To see the issues, you can set the font atlas size to 128 * 128 by changing line 325 "ft__bad_rect_pack_init(&pack, V2i32(1024, 1024));" to "ft__bad_rect_pack_init(&pack, V2i32(128, 128));".

The first issue was that the max_dim.y parameter was not respected. The dimension produced would always grow on Y to accommodate for more characters. And so the whole texture array thing was never use.

A second issue was that when a character didn't fit on the x axis, we created a new line, but never check that the new line fitted in the current texture slice.

A third issue was that when we ended a line because a character didn't fit vertically, we grew the line with a line height equal to the height of the character that didn't fit.
This commit is contained in:
Simon Anciaux 2024-02-28 15:24:44 +01:00 committed by Peter Slattery
parent 7359649465
commit f2abe27704
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
code/4ed_font_provider_freetype.cpp
View File

@ -125,27 +125,53 @@ ft__bad_rect_pack_end_line(Bad_Rect_Pack *pack){
internal Vec3_i32 internal Vec3_i32
ft__bad_rect_pack_next(Bad_Rect_Pack *pack, Vec2_i32 dim){ ft__bad_rect_pack_next(Bad_Rect_Pack *pack, Vec2_i32 dim){
Vec3_i32 result = {};
if (dim.x <= pack->max_dim.x && dim.y <= pack->max_dim.y){ Vec3_i32 result = { };
if (pack->current_line_h < dim.y){
pack->current_line_h = dim.y; // NOTE(simon, 28/02/24): Does this character fit in the texture if it's the only character ?
if ( dim.x <= pack->max_dim.x && dim.y <= pack->max_dim.y ){
b8 end_line = false;
if ( pack->p.x + dim.x > pack->max_dim.x ) {
// NOTE(simon, 28/02/24): Can't fit the character horizontally.
end_line = true;
} }
if (pack->current_line_h > pack->max_dim.y){
ft__bad_rect_pack_end_line(pack); if ( pack->current_line_h < dim.y && pack->p.y + dim.y > pack->max_dim.y ) {
// NOTE(simon, 28/02/24): Character doesn't fit in the current line height, AND we
// can't grow the line height.
end_line = true;
}
if ( end_line ) {
ft__bad_rect_pack_end_line( pack );
}
if ( pack->p.y + dim.y > pack->max_dim.y ) {
Assert( end_line );
// NOTE(simon, 28/02/24): We ended a line. There isn't enough space on a new line to
// fit the character vertically. We need to go to the next texture in the array.
// In a new texture the character is guaranteed to fit, because of the outer most if.
pack->p.y = 0; pack->p.y = 0;
pack->dim.z += 1; pack->dim.z += 1;
pack->p.z += 1; pack->p.z += 1;
// NOTE(simon, 28/02/24): There are no checks on the z axis range, but texture arrays
// have a limit. At the moment it's 2048 on both OpenGL and DirectX.
} }
else{
if (pack->p.x + dim.x > pack->max_dim.x){ // NOTE(simon, 28/02/24): We are now sure that the character will fit.
ft__bad_rect_pack_end_line(pack);
if ( pack->current_line_h < dim.y ) {
pack->current_line_h = dim.y;
} }
result = pack->p; result = pack->p;
pack->p.x += dim.x; pack->p.x += dim.x;
pack->current_line_h = Max(pack->current_line_h, dim.y); pack->dim.x = Max( pack->dim.x, pack->p.x );
pack->dim.x = clamp_bot(pack->dim.x, pack->p.x);
}
} }
return(result); return(result);
} }