NUKE legacy console font ('bigchars')

NUKE the legacy console font rendering code, which loaded a shader named
gfx/2d/bigchars. And remove the assets. This was only used if the font
speicfied by cl_consoleFont failed to load

Author: slipher

pkg/daemon_src.dpkdir/gfx/2d/bigchars.png

@@ -7,15 +7,3 @@ white
 		rgbgen vertex
 	}
 }
-
-// console font fallback
-gfx/2d/bigchars
-{
-	nopicmip
-	nomipmaps
-	{
-		map gfx/2d/bigchars
-		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-		rgbgen vertex
-	}
-}

pkg/daemon_src.dpkdir/scripts/engine.shader

@@ -2095,8 +2095,6 @@ bool CL_InitRenderer()
 		return false;
 	}
 
-	fileHandle_t f;
-
 	// this sets up the renderer and calls R_Init
 	if ( !re.BeginRegistration( &cls.windowConfig ) )
 	{
@@ -2107,28 +2105,37 @@ bool CL_InitRenderer()
 	cl_consoleFontSize = Cvar_Get( "cl_consoleFontSize", "16",  CVAR_LATCH );
 	cl_consoleFontScaling = Cvar_Get( "cl_consoleFontScaling", "1", CVAR_LATCH );
 
-	// load character sets
-	cls.charSetShader = re.RegisterShader( "gfx/2d/bigchars", RSF_2D );
-	cls.useLegacyConsoleFont = cls.useLegacyConsoleFace = true;
-
 	// Register console font specified by cl_consoleFont. Empty string means use the embbed Unifont
 
-	if ( cl_consoleFontScaling->value == 0 )
-	{
-		cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer );
-	}
-	else
+	int fontSize = cl_consoleFontSize->integer;
+
+	if ( cl_consoleFontScaling->integer )
 	{
 		// This gets 12px on 1920×1080 screen, which is libRocket default for 1em
 		int fontScale = std::min(cls.windowConfig.vidWidth, cls.windowConfig.vidHeight) / 90;
 
 		// fontScale / 12px gets 1px on 1920×1080 screen
-		cls.consoleFont = re.RegisterFont( cl_consoleFont->string, cl_consoleFontSize->integer * fontScale / 12 );
+		fontSize = cl_consoleFontSize->integer * fontScale / 12;
+	}
+
+	if ( cl_consoleFont->string[ 0 ] )
+	{
+		cls.consoleFont = re.RegisterFont( cl_consoleFont->string, fontSize );
+		if ( cls.consoleFont == nullptr )
+		{
+			Log::Warn( "Couldn't load font file '%s', falling back to default console font",
+			            cl_consoleFont->string );
+		}
 	}
 
-	if ( cls.consoleFont != nullptr )
+	if ( cls.consoleFont == nullptr )
 	{
-		cls.useLegacyConsoleFont = false;
+		cls.consoleFont = re.RegisterFont( "", fontSize );
+
+		if ( cls.consoleFont == nullptr )
+		{
+			Sys::Error( "Failed to load built-in console font" );
+		}
 	}
 
 	cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP );

src/engine/client/cl_main.cpp

@@ -107,12 +107,6 @@ static glyphInfo_t *Glyph( int ch )
 
 void SCR_DrawConsoleFontUnichar( float x, float y, int ch )
 {
-	if ( cls.useLegacyConsoleFont )
-	{
-		SCR_DrawSmallUnichar( ( int ) x, ( int ) y, ch );
-		return;
-	}
-
 	if ( ch != ' ' )
 	{
 		glyphInfo_t *glyph = Glyph( ch );
@@ -126,53 +120,6 @@ void SCR_DrawConsoleFontUnichar( float x, float y, int ch )
 	}
 }
 
-/*
-** SCR_DrawSmallUnichar
-** small chars are drawn at native screen resolution
-*/
-void SCR_DrawSmallUnichar( int x, int y, int ch )
-{
-	int   row, col;
-	float frow, fcol;
-	float size;
-
-	if ( ch < 0x100 || cls.useLegacyConsoleFont )
-	{
-		if ( ch == ' ' ) {
-			return;
-		}
-
-		if ( y < -SMALLCHAR_HEIGHT ) {
-			return;
-		}
-
-		if ( ch >= 0x100 ) { ch = 0; }
-
-		row = ch>>4;
-		col = ch&15;
-
-		frow = row*0.0625;
-		fcol = col*0.0625;
-		size = 0.0625;
-
-		// adjust for baseline
-		re.DrawStretchPic( x, y - (int)( SMALLCHAR_HEIGHT / ( CONSOLE_FONT_VPADDING + 1 ) ),
-		                SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT,
-				fcol, frow,
-				fcol + size, frow + size,
-				cls.charSetShader );
-	} else {
-		glyphInfo_t *glyph = Glyph( ch );
-
-		re.DrawStretchPic( x, y, SMALLCHAR_WIDTH, glyph->imageHeight,
-				glyph->s,
-				glyph->t,
-				glyph->s2,
-				glyph->t2,
-				glyph->glyph );
-	}
-}
-
 /*
 ==================
 SCR_DrawSmallString[Color]
@@ -335,9 +282,7 @@ void SCR_UpdateScreen()
 
 float SCR_ConsoleFontUnicharWidth( int ch )
 {
-	return cls.useLegacyConsoleFont
-	       ? SMALLCHAR_WIDTH
-	       : Glyph( ch )->xSkip + cl_consoleFontKerning->value;
+	return Glyph( ch )->xSkip + cl_consoleFontKerning->value;
 }
 
 float SCR_ConsoleFontCharWidth( const char *s )
@@ -347,44 +292,18 @@ float SCR_ConsoleFontCharWidth( const char *s )
 
 float SCR_ConsoleFontCharHeight()
 {
-	return cls.useLegacyConsoleFont
-	       ? SMALLCHAR_HEIGHT
-	       : cls.consoleFont->glyphBlock[0][(unsigned)'I'].imageHeight + CONSOLE_FONT_VPADDING * cl_consoleFontSize->value;
+	return cls.consoleFont->glyphBlock[0][(unsigned)'I'].imageHeight + CONSOLE_FONT_VPADDING * cl_consoleFontSize->value;
 }
 
 float SCR_ConsoleFontCharVPadding()
 {
-	return cls.useLegacyConsoleFont
-	       ? 0
-	       : std::max( 0, -cls.consoleFont->glyphBlock[0][(unsigned)'g'].bottom >> 6);
+	return std::max( 0, -cls.consoleFont->glyphBlock[0][(unsigned)'g'].bottom >> 6);
 }
 
 float SCR_ConsoleFontStringWidth( const char* s, int len )
 {
 	float width = 0;
 
-	if( cls.useLegacyConsoleFont )
-	{
-		if( cls.useLegacyConsoleFace )
-		{
-			return len * SMALLCHAR_WIDTH;
-		}
-		else
-		{
-			int l = 0;
-			const char *str = s;
-
-			while( *str && len > 0 )
-			{
-				l++;
-				str += Q_UTF8_Width( str );
-				len--;
-			}
-
-			return l * SMALLCHAR_WIDTH;
-		}
-	}
-
 	while( *s && len > 0 )
 	{
 		width += SCR_ConsoleFontCharWidth( s );

src/engine/client/cl_scrn.cpp

@@ -315,10 +315,7 @@ struct clientStatic_t
 
 	// rendering info
 	WindowConfig windowConfig;
-	qhandle_t   charSetShader;
 	qhandle_t   whiteShader;
-	bool    useLegacyConsoleFont;
-	bool    useLegacyConsoleFace;
 	fontInfo_t *consoleFont;
 
 	// www downloading
@@ -655,7 +652,6 @@ void  SCR_AdjustFrom640( float *x, float *y, float *w, float *h );
 void  SCR_FillRect( float x, float y, float width, float height, const Color::Color& color );
 
 void  SCR_DrawSmallStringExt( int x, int y, const char *string, const Color::Color& setColor, bool forceColor, bool noColorEscape );
-void  SCR_DrawSmallUnichar( int x, int y, int ch );
 void  SCR_DrawConsoleFontUnichar( float x, float y, int ch );
 float SCR_ConsoleFontCharWidth( const char *s );
 float SCR_ConsoleFontUnicharWidth( int ch );

src/engine/client/client.h

@@ -52,7 +52,11 @@ qhandle_t RE_RegisterShader( const char *, int )
 }
 fontInfo_t* RE_RegisterFont( const char *, int )
 {
-	return nullptr;
+	return new fontInfo_t{};
+}
+void RE_UnregisterFont( fontInfo_t* p )
+{
+	delete p;
 }
 void RE_GlyphChar( fontInfo_t *, int, glyphInfo_t *glyph )
 {
@@ -70,7 +74,6 @@ void RE_GlyphChar( fontInfo_t *, int, glyphInfo_t *glyph )
 	glyph->glyph = 1;
 	glyph->shaderName[0] = '\0';
 }
-void RE_UnregisterFont( fontInfo_t* ) { }
 void RE_LoadWorldMap( const char * ) { }
 void RE_SetWorldVisData( const byte * ) { }
 void RE_EndRegistration() { }