From b10b0f06c329b865b72ee40c3122f009c457f2d4 Mon Sep 17 00:00:00 2001
From: Qwerasd <qwerasd205@users.noreply.github.com>
Date: Sun, 6 Jul 2025 15:53:59 -0600
Subject: [PATCH] font: remove unused fields from Glyph

We can reintroduce `advance` if we ever want to do proportional string
drawing, but we don't use it anywhere right now. And we also don't need
`sprite` anymore since that was just there to disable constraints for
sprites back when we did them on the GPU.
---
 src/font/Glyph.zig           | 6 ------
 src/font/face/coretext.zig   | 6 ------
 src/font/face/freetype.zig   | 2 --
 src/font/face/web_canvas.zig | 1 -
 src/font/sprite/Face.zig     | 3 ---
 5 files changed, 18 deletions(-)

diff --git a/src/font/Glyph.zig b/src/font/Glyph.zig
index fa29e44fa..f99370271 100644
--- a/src/font/Glyph.zig
+++ b/src/font/Glyph.zig
@@ -17,9 +17,3 @@ offset_y: i32,
 /// be normalized to be between 0 and 1 prior to use in shaders.
 atlas_x: u32,
 atlas_y: u32,
-
-/// horizontal position to increase drawing position for strings
-advance_x: f32,
-
-/// Whether we drew this glyph ourselves with the sprite font.
-sprite: bool = false,
diff --git a/src/font/face/coretext.zig b/src/font/face/coretext.zig
index 5c9c259d2..7d750b0d6 100644
--- a/src/font/face/coretext.zig
+++ b/src/font/face/coretext.zig
@@ -333,7 +333,6 @@ pub const Face = struct {
                 .offset_y = 0,
                 .atlas_x = 0,
                 .atlas_y = 0,
-                .advance_x = 0,
             };
 
         const metrics = opts.grid_metrics;
@@ -498,10 +497,6 @@ pub const Face = struct {
             break :offset_x result;
         };
 
-        // Get our advance
-        var advances: [glyphs.len]macos.graphics.Size = undefined;
-        _ = self.font.getAdvancesForGlyphs(.horizontal, &glyphs, &advances);
-
         return .{
             .width = px_width,
             .height = px_height,
@@ -509,7 +504,6 @@ pub const Face = struct {
             .offset_y = offset_y,
             .atlas_x = region.x,
             .atlas_y = region.y,
-            .advance_x = @floatCast(advances[0].width),
         };
     }
 
diff --git a/src/font/face/freetype.zig b/src/font/face/freetype.zig
index b27b28ab8..079cf5b2d 100644
--- a/src/font/face/freetype.zig
+++ b/src/font/face/freetype.zig
@@ -373,7 +373,6 @@ pub const Face = struct {
                 .offset_y = 0,
                 .atlas_x = 0,
                 .atlas_y = 0,
-                .advance_x = 0,
             };
 
         // For synthetic bold, we embolden the glyph.
@@ -662,7 +661,6 @@ pub const Face = struct {
             .offset_y = offset_y,
             .atlas_x = region.x,
             .atlas_y = region.y,
-            .advance_x = f26dot6ToFloat(glyph.*.advance.x),
         };
     }
 
diff --git a/src/font/face/web_canvas.zig b/src/font/face/web_canvas.zig
index 30540191d..7ea2f0426 100644
--- a/src/font/face/web_canvas.zig
+++ b/src/font/face/web_canvas.zig
@@ -235,7 +235,6 @@ pub const Face = struct {
             .offset_y = 0,
             .atlas_x = region.x,
             .atlas_y = region.y,
-            .advance_x = 0,
         };
     }
 
diff --git a/src/font/sprite/Face.zig b/src/font/sprite/Face.zig
index 1463fb38b..dfff8fa75 100644
--- a/src/font/sprite/Face.zig
+++ b/src/font/sprite/Face.zig
@@ -195,7 +195,6 @@ pub fn renderGlyph(
         .offset_y = 0,
         .atlas_x = 0,
         .atlas_y = 0,
-        .advance_x = 0,
     };
 
     const metrics = self.metrics;
@@ -227,8 +226,6 @@ pub fn renderGlyph(
         .offset_y = @as(i32, @intCast(region.height +| canvas.clip_bottom)) - @as(i32, @intCast(padding_y)),
         .atlas_x = region.x,
         .atlas_y = region.y,
-        .advance_x = @floatFromInt(width),
-        .sprite = true,
     };
 }