From 6ca5f7c6fb09de5ee8497dcdbec1a2935ff91a0f Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 29 Jan 2024 05:41:16 +0300 Subject: [PATCH] engine: client: request if font texture has nearest filtering from the renderer --- engine/client/cl_font.c | 4 +--- engine/client/client.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/engine/client/cl_font.c b/engine/client/cl_font.c index a5ac2076..7d5a1c92 100644 --- a/engine/client/cl_font.c +++ b/engine/client/cl_font.c @@ -60,7 +60,6 @@ qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float sc font->type = FONT_FIXED; font->valid = true; font->scale = scale; - font->nearest = FBitSet( texFlags, TF_NEAREST ); font->rendermode = rendermode; font->charHeight = Q_rint( font_width / 16 * scale ); @@ -107,7 +106,6 @@ qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font, float font->type = FONT_VARIABLE; font->valid = true; font->scale = scale; - font->nearest = FBitSet( texFlags, TF_NEAREST ); font->rendermode = rendermode; font->charHeight = Q_rint( src.rowheight * scale ); @@ -179,7 +177,7 @@ int CL_DrawCharacter( float x, float y, int number, rgba_t color, cl_font_t *fon return font->charWidths[number]; rc = &font->fontRc[number]; - if( font->nearest || font->scale <= 1.0f ) + if( font->scale <= 1.0f || REF_GET_PARM( PARM_TEX_FILTERING, font->hFontTexture )) half = 0; s1 = ((float)rc->left + half ) / texw; diff --git a/engine/client/client.h b/engine/client/client.h index c01e18a5..72700e31 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -343,7 +343,6 @@ typedef struct int charHeight; // scaled height int type; // fixed width font or variable int rendermode; // default rendermode - qboolean nearest; // nearest filtering enabled qboolean valid; // all rectangles are valid } cl_font_t;