Browse Source

engine: client: request if font texture has nearest filtering from the renderer

master
Alibek Omarov 5 months ago
parent
commit
6ca5f7c6fb
  1. 4
      engine/client/cl_font.c
  2. 1
      engine/client/client.h

4
engine/client/cl_font.c

@ -60,7 +60,6 @@ qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font, float sc @@ -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 @@ -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 @@ -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;

1
engine/client/client.h

@ -343,7 +343,6 @@ typedef struct @@ -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;

Loading…
Cancel
Save