AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 03:06:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Calculate font unit per pixel dynamically (#1629)

Browse Source 
This PR turns font unit per pixel (a "magic number") into actually
computed value. Previously the "font unit per pixel" is hardcoded as
float `4.0`, because `units_per_EM` field of unscii is 64, and default
font size is 16. If another font is loaded, layout will be corrupted by
invalid scaling of `glyphPositions`. Note that only transformation from
font unit to pixel is affected, no visual change is made, and width of
glyph(character) is not changed.
This commit is contained in:
Yiheng Wu 2025-06-18 21:37:50 +08:00 committed by GitHub
parent fe09535244
commit f75f3d40e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics.zig
View File

@ -843,10 +843,10 @@ pub const TextBuffer = struct { // MARK: TextBuffer
// Merge it all together:
self.glyphs = allocator.alloc(GlyphData, glyphInfos.len);
for(self.glyphs, 0..) |*glyph, i| {
glyph.x_advance = @as(f32, @floatFromInt(glyphPositions[i].x_advance))/4.0;
glyph.y_advance = @as(f32, @floatFromInt(glyphPositions[i].y_advance))/4.0;
glyph.x_offset = @as(f32, @floatFromInt(glyphPositions[i].x_offset))/4.0;
glyph.y_offset = @as(f32, @floatFromInt(glyphPositions[i].y_offset))/4.0;
glyph.x_advance = @as(f32, @floatFromInt(glyphPositions[i].x_advance))/TextRendering.fontUnitsPerPixel;
glyph.y_advance = @as(f32, @floatFromInt(glyphPositions[i].y_advance))/TextRendering.fontUnitsPerPixel;
glyph.x_offset = @as(f32, @floatFromInt(glyphPositions[i].x_offset))/TextRendering.fontUnitsPerPixel;
glyph.y_offset = @as(f32, @floatFromInt(glyphPositions[i].y_offset))/TextRendering.fontUnitsPerPixel;
glyph.character = @intCast(parser.parsedText.items[textIndexGuess[i]]);
glyph.index = glyphInfos[i].codepoint;
glyph.cluster = glyphInfos[i].cluster;
@ -1149,6 +1149,7 @@ const TextRendering = struct { // MARK: TextRendering
var textureWidth: i32 = 1024;
const textureHeight: i32 = 16;
var textureOffset: i32 = 0;
var fontUnitsPerPixel: f32 = undefined;
fn ftError(errorCode: hbft.FT_Error) !void {
if(errorCode == 0) return;
@ -1176,6 +1177,7 @@ const TextRendering = struct { // MARK: TextRendering
try ftError(hbft.FT_Set_Pixel_Sizes(freetypeFace, 0, textureHeight));
harfbuzzFace = hbft.hb_ft_face_create_referenced(freetypeFace);
harfbuzzFont = hbft.hb_font_create(harfbuzzFace);
fontUnitsPerPixel = @as(f32, @floatFromInt(freetypeFace.*.units_per_EM))/@as(f32, @floatFromInt(textureHeight));
glyphMapping = .init(main.globalAllocator);
glyphData = .init(main.globalAllocator);