Release v7.0: per-font glyph snap and XP scaled UI alignment fixes.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: d3nd3

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v7.0
+
+### Scaled UI — per-font glyph snap & XP alignment fixes
+
+- **Per-font glyph grid:** `snap_font_scale_to_glyph_grid(s, glyphPx)` uses each font’s `realFontSizes` entry; helpers `snapped_text_scale_active()`, `console_font_scale()`, and `font_glyph_px()`.
+- **Raw scale at cvar, snap at draw:** `fontScale` / `hudScale` stay on the resolution ratio at the cvar; glyph snap applies on text draw/layout paths only — HUD sprites and cropped pics keep raw `hudScale`.
+- **Console (XP):** `Con_DrawConsole`, `Con_CheckResize`, `Con_DrawNotify`, and console `Draw_Char` vertices all use `console_font_scale()` (8px medium grid) so layout and glyphs stay aligned.
+- **Mission status:** pivot-based per-font glyph scaling plus `R_DrawFont` horizontal compensation for centered red objective text.
+- **Center print:** restored bottom-anchored multi-line scaling (reverts v6.9 screen-center vertex model).
+- **DM ranking:** `R_DrawFont` entry offsets and font vertices both use the same snapped text scale.
+- **Inventory / ammo HUD:** ammo and item count text uses raw `hudScale` to match cropped panel pics (glyph snap drifted labels off the art on XP).
+- **Cinematic typematic:** char positions and quads use per-font glyph snap; removed per-vertex `snap_ui_pixel` rounding.
+- **Menu text:** server box / tip render paths use snapped `screen_y_scale` per active font.
+
 ## v6.9
 
 ### Scaled UI — center print scaling (screen-center model)

VERSION

@@ -1 +1 @@
-6.9
+7.0

hdr/version.h

@@ -7,4 +7,4 @@
     Increment version using: ./increment_version.sh
 */
 
-#define SOFBUDDY_VERSION "6.9"
+#define SOFBUDDY_VERSION "7.0"

src/features/scaled_con/console.cpp

@@ -64,7 +64,6 @@ void fontscale_change(cvar_t * cvar) {
 
     SOFBUDDY_ASSERT(cvar->value > 0.0f);
     fontScale = round_scale_value(cvar->value);
-    fontScale = snap_font_scale_to_glyph_grid(fontScale);
 	PrintOut(PRINT_LOG,"Precise fontScale change: %.10f\n", fontScale);
 
 	//Protect from divide by 0.
@@ -75,7 +74,7 @@ void fontscale_change(cvar_t * cvar) {
 	SOFBUDDY_ASSERT(fontScale > 0.0f);
 	if (detour_Cvar_Set2::oCvar_Set2) {
 		char buf[32];
-		std::snprintf(buf, sizeof(buf), "%.2f", fontScale);
+		std::snprintf(buf, sizeof(buf), "%.2f", console_font_scale(fontScale));
 		detour_Cvar_Set2::oCvar_Set2(const_cast<char*>("_sofbuddy_font_scale_rounded"), buf, true);
 	}
 }
@@ -90,11 +89,10 @@ void apply_auto_font_scale(void) {
 	if (!fontScaleAuto) return;
 	fontScale = (screen_y_scale > 0.0f) ? screen_y_scale : 1.0f;
 	if (scaleRoundAuto) fontScale = round_scale_value(fontScale);
-	fontScale = snap_font_scale_to_glyph_grid(fontScale);
 	SOFBUDDY_ASSERT(fontScale > 0.0f);
 	if (detour_Cvar_Set2::oCvar_Set2) {
 		char buf[32];
-		std::snprintf(buf, sizeof(buf), "%.2f", fontScale);
+		std::snprintf(buf, sizeof(buf), "%.2f", console_font_scale(fontScale));
 		detour_Cvar_Set2::oCvar_Set2(const_cast<char*>("_sofbuddy_font_scale_rounded"), buf, true);
 	}
 }

src/features/scaled_con/hooks/con_checkresize.cpp

@@ -11,10 +11,12 @@ void hkCon_CheckResize(detour_Con_CheckResize::tCon_CheckResize original) {
 	SOFBUDDY_ASSERT(viddef_width != nullptr);
 	SOFBUDDY_ASSERT(fontScale > 0.0f);
 	SOFBUDDY_ASSERT(current_vid_w > 0);
+
+	const float cs = console_font_scale(fontScale);
 
 	//This makes con.linewidth smaller in order to reduce the character count per line.
 	int viddef_before = current_vid_w;
-	*viddef_width = 1 / fontScale * current_vid_w;
+	*viddef_width = (int)(current_vid_w / cs);
 
 	SOFBUDDY_ASSERT(*viddef_width > 0);
 	original();

src/features/scaled_con/hooks/con_drawconsole.cpp

@@ -17,22 +17,24 @@ void hkCon_DrawConsole(float frac, detour_Con_DrawConsole::tCon_DrawConsole orig
 	SOFBUDDY_ASSERT(fontScale > 0.0f);
 	SOFBUDDY_ASSERT(frac >= 0.0f && frac <= 1.0f);
 	SOFBUDDY_ASSERT(consoleSize >= 0.0f && consoleSize <= 1.0f);
+
+	const float cs = console_font_scale(fontScale);
 
 	resetGlVertexQuadState();
 	g_activeRenderType = uiRenderType::Console;
 	g_currentStretchPicCaller = StretchPicCaller::CON_DrawConsole;
 
 	if (frac == 0.5 && *cls_state == 8) {
-		frac = consoleSize / fontScale;
+		frac = consoleSize / cs;
 		draw_con_frac = consoleSize;
 	} else {
 		draw_con_frac = frac;
-		frac = frac / fontScale;
+		frac = frac / cs;
 	}
 
 	SOFBUDDY_ASSERT(frac >= 0.0f);
 	real_refdef_width = current_vid_w;
-	*viddef_width = (int)(current_vid_w / fontScale);
+	*viddef_width = (int)(current_vid_w / cs);
 	original(frac);
 	*viddef_width = real_refdef_width;
 

src/features/scaled_con/hooks/con_drawnotify.cpp

@@ -12,11 +12,13 @@ void hkCon_DrawNotify(detour_Con_DrawNotify::tCon_DrawNotify original) {
 	SOFBUDDY_ASSERT(viddef_width != nullptr);
 	SOFBUDDY_ASSERT(fontScale > 0.0f);
 	SOFBUDDY_ASSERT(current_vid_w > 0);
+
+	const float cs = console_font_scale(fontScale);
 
 	real_refdef_width = current_vid_w;
 
 	//fake the width
-	*viddef_width = 1 / fontScale * current_vid_w;
+	*viddef_width = (int)(current_vid_w / cs);
 
 	SOFBUDDY_ASSERT(*viddef_width > 0);
 	resetGlVertexQuadState();

src/features/scaled_ui_base/hooks/draw_charextra.cpp

@@ -14,13 +14,14 @@ void hkDraw_CharExtra(float x, float y, float scale, void* palette, int ch,
     // Anchor Y to the last line. Preserve vanilla bottom margin as a 480p percentage
     // so scaled text stays on-screen at any resolution.
     if (g_cinematicDrawDepth > 0 && fontScale != 1.0f) {
+        const float s = snap_font_scale_to_glyph_grid(fontScale, realFontSizes[REALFONT_MEDIUM]);
         if (g_cineTextBaseY < 0.0f) {
             g_cineTextBaseY = y;
             const int lines = (g_cineTextLineCount > 0) ? g_cineTextLineCount : 1;
             computeTextBottomAnchor(g_cineTextBaseY, lines, 8.0f,
                 g_cineTextBottomY, g_cineTextTargetBottomY);
         }
-        applyBottomAnchoredScale(x, y, g_cineTextBottomY, g_cineTextTargetBottomY, fontScale, false);
+        applyBottomAnchoredScale(x, y, g_cineTextBottomY, g_cineTextTargetBottomY, s, false);
     }
     original(x, y, scale, palette, ch);
 }

src/features/scaled_ui_base/hooks/glvertex2f.cpp

@@ -64,7 +64,9 @@ static inline bool tryScoreboardVertex(float& x, float& y) {
 
 #if FEATURE_SCALED_HUD || FEATURE_SCALED_MENU
 static inline void scaleCinematicVertex(float x, float y) {
-    if (fontScale == 1.0f) {
+    const int glyphPx = realFontSizes[REALFONT_MEDIUM];
+    const float s = snap_font_scale_to_glyph_grid(fontScale, glyphPx);
+    if (s == 1.0f) {
         orig_glVertex2f(x, y);
         return;
     }
@@ -73,8 +75,8 @@ static inline void scaleCinematicVertex(float x, float y) {
         g_cineAnchorY = y;
     }
     orig_glVertex2f(
-        snap_ui_pixel(g_cineAnchorX + (x - g_cineAnchorX) * fontScale),
-        snap_ui_pixel(g_cineAnchorY + (y - g_cineAnchorY) * fontScale));
+        g_cineAnchorX + (x - g_cineAnchorX) * s,
+        g_cineAnchorY + (y - g_cineAnchorY) * s);
     if (++g_cineVertexIndex > 4) g_cineVertexIndex = 1;
 }
 #endif
@@ -95,7 +97,8 @@ static void handleDrawCharVertex(float x, float y) {
     if (g_activeRenderType == uiRenderType::Console &&
         g_activeDrawCall != DrawRoutineType::StretchPic) {
         SOFBUDDY_ASSERT(fontScale > 0.0f);
-        orig_glVertex2f(x * fontScale, y * fontScale);
+        const float s = console_font_scale(fontScale);
+        orig_glVertex2f(x * s, y * s);
         return;
     }
     orig_glVertex2f(x, y);

src/features/scaled_ui_base/hooks/r_drawfont.cpp

@@ -7,7 +7,6 @@
 #include "generated_detours.h"
 #include "../../scaled_ui_base/shared.h"
 #include "debug/hook_callsite.h"
-#include "debug/callsite_classifier.h"
 #include <string.h>
 
 static bool s_dmRankingScorePhase = true;
@@ -64,8 +63,6 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
                 g_centerPrintAnchorY = static_cast<float>(screenY);
             s_cpLastY = static_cast<float>(screenY);
         }
-    } else if (g_currentFontCaller == FontCaller::MissionStatus) {
-        g_missionStatusAnchorY = static_cast<float>(screenY);
     }
 
 	SOFBUDDY_ASSERT(font != nullptr);
@@ -75,16 +72,25 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 		realFont = REALFONT_UNKNOWN;
 	}
 
-	if (g_currentFontCaller == FontCaller::SCRDrawPause) {
-		float s = fontScale;
-		if (s <= 0.0f) s = 1.0f;
+	if (g_currentFontCaller == FontCaller::MissionStatus) {
+		const float s = snapped_text_scale_active(fontScale);
+		if (s != 1.0f) {
+			const float vid_w = (viddef_width && *viddef_width > 0)
+				? static_cast<float>(*viddef_width)
+				: (current_vid_w > 0 ? static_cast<float>(current_vid_w) : 640.0f);
+			const float textW = vid_w - 2.0f * static_cast<float>(screenX);
+			screenX -= static_cast<int>(textW * (s - 1.0f) * 0.5f);
+		}
+	} else if (g_currentFontCaller == FontCaller::SCRDrawPause) {
+		const float s = snapped_text_scale_active(fontScale);
 		if (s != 1.0f) {
 			const float textW = (float)(current_vid_w - 2 * screenX);
 			const float textH = (float)(current_vid_h - 2 * screenY);
 			screenX -= (int)(textW * (s - 1.0f) * 0.5f);
 			screenY -= (int)(textH * (s - 1.0f) * 0.5f);
 		}
 	} else if (g_activeRenderType == uiRenderType::HudDmRanking) {
+		const float hs = snapped_text_scale_active(hudScale);
 		int fontWidth = 12;
 		int offsetEdge = 40;
 
@@ -94,16 +100,16 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 			static int* s_dm_ranking_state = (int*)rvaToAbsExe((void*)0x001E7E94);
 			if (s_dm_ranking_state && *s_dm_ranking_state == 7) {
 				int half_text_len = screenX - (current_vid_w - (offsetEdge * x_scale));
-				screenX = current_vid_w - offsetEdge * x_scale - 16 * hudScale + half_text_len*hudScale;
-				screenY = 20 * screen_y_scale + 64 * hudScale + 6 * screen_y_scale;
+				screenX = current_vid_w - offsetEdge * x_scale - 16 * hs + half_text_len * hs;
+				screenY = 20 * screen_y_scale + 64 * hs + 6 * screen_y_scale;
 			} else {
-				screenX = current_vid_w - 16 * hudScale - offsetEdge * x_scale - hudScale*fontWidth * strlen(text) / 2;
-				screenY = screenY + (hudScale - 1) * (32 + 3);
+				screenX = current_vid_w - 16 * hs - offsetEdge * x_scale - hs * fontWidth * strlen(text) / 2;
+				screenY = screenY + (hs - 1) * (32 + 3);
 
 				if (s_dmRankingScorePhase) {
 					s_dmRankingScorePhase = false;
 				} else {
-					screenY = screenY + (hudScale - 1) * (realFontSizes[realFont] + 3);
+					screenY = screenY + (hs - 1) * (realFontSizes[realFont] + 3);
 					s_dmRankingScorePhase = true;
 				}
 			}
@@ -112,13 +118,15 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 			if (s_dmRankingScorePhase) {
 				s_dmRankingScorePhase = false;
 			} else {
-				screenY = screenY + (hudScale - 1) * (realFontSizes[realFont] + 3);
+				screenY = screenY + (hs - 1) * (realFontSizes[realFont] + 3);
 				s_dmRankingScorePhase = true;
 			}
-			screenX = current_vid_w - offsetEdge * x_scale - 16 * hudScale - hudScale*fontWidth * strlen(text) / 2;
+			screenX = current_vid_w - offsetEdge * x_scale - 16 * hs - hs * fontWidth * strlen(text) / 2;
 		}
 
 	} else if (g_activeRenderType == uiRenderType::HudInventory) {
+		// Match cropped pics (raw hudScale); glyph snap drifts text off the panels.
+		const float hs = hudScale;
 		if ( hudInventory_wasItem ) {
 			if (text && ( (text[0] >= '0' && text[0] <= '8') || (text[0] =='9' && text[1] != 'm') ) ) {
 				float set_x,set_y;
@@ -127,8 +135,8 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 				drawCroppedPicVertex(false,false,set_x,set_y);
 				hudCroppedEnum = before;
 
-				screenX = set_x + -52.0f * hudScale;
-				screenY = set_y + -29.0f * hudScale;
+				screenX = set_x + -52.0f * hs;
+				screenY = set_y + -29.0f * hs;
 			} else {
 				float set_x,set_y;
 				enumCroppedDrawMode before = hudCroppedEnum;
@@ -138,7 +146,7 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 				drawCroppedPicVertex(true,false,set_x,set_y);
 				hudCroppedEnum = before;
 
-				screenX = set_x + -111.0f * hudScale;
+				screenX = set_x + -111.0f * hs;
 				screenY = set_y;
 			}
 		} else {
@@ -150,8 +158,8 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 				drawCroppedPicVertex(false,false,set_x,set_y);
 				hudCroppedEnum = before;
 
-				screenX = set_x + -97.0f * hudScale;
-				screenY = set_y + -29.0f * hudScale;
+				screenX = set_x + -97.0f * hs;
+				screenY = set_y + -29.0f * hs;
 			}
 			else {
 				float set_x,set_y;
@@ -162,15 +170,13 @@ void hkR_DrawFont(int screenX, int screenY, char * text, int colorPalette, char
 				drawCroppedPicVertex(true,false,set_x,set_y);
 				hudCroppedEnum = before;
 
-				screenX = set_x + -79.0f * hudScale;
+				screenX = set_x + -79.0f * hs;
 				screenY = set_y;
 			}
 		}
 	}
 	original(screenX, screenY, text, colorPalette, font, rememberLastColor);
 
-	// MissionStatus and SCR_DrawCenterPrint are set by their parent hooks and span
-	// multiple R_DrawFont calls (one per line); keep the caller so lines 2+ scale too.
 	if (g_currentFontCaller != FontCaller::MissionStatus &&
 	    g_currentFontCaller != FontCaller::SCR_DrawCenterPrint)
 		g_currentFontCaller = FontCaller::Unknown;