Remove unused font things

RE_Glyph(), fontInfo_t::height, fontInfo_t::glyphScale, a couple macros

Author: slipher

src/engine/RefAPI.h

@@ -77,7 +77,6 @@ struct refexport_t {
 	qhandle_t( *RegisterShader )( const char* name, int flags );
 	fontInfo_t* ( *RegisterFont )( const char* fontName, int pointSize );
 	void   ( *UnregisterFont )( fontInfo_t* font );
-	void   ( *Glyph )( fontInfo_t* font, const char* str, glyphInfo_t* glyph );
 	void   ( *GlyphChar )( fontInfo_t* font, int ch, glyphInfo_t* glyph );
 
 	void ( *LoadWorld )( const char* name );

src/engine/null/null_renderer.cpp

@@ -54,7 +54,7 @@ fontInfo_t* RE_RegisterFont( const char *, int )
 {
 	return nullptr;
 }
-void RE_Glyph( fontInfo_t *, const char *, glyphInfo_t *glyph )
+void RE_GlyphChar( fontInfo_t *, int, glyphInfo_t *glyph )
 {
 	glyph->height = 1;
 	glyph->top = 1;
@@ -70,10 +70,6 @@ void RE_Glyph( fontInfo_t *, const char *, glyphInfo_t *glyph )
 	glyph->glyph = 1;
 	glyph->shaderName[0] = '\0';
 }
-void RE_GlyphChar( fontInfo_t *font, int, glyphInfo_t *glyph )
-{
-	RE_Glyph( font, nullptr, glyph );
-}
 void RE_UnregisterFont( fontInfo_t* ) { }
 void RE_LoadWorldMap( const char * ) { }
 void RE_SetWorldVisData( const byte * ) { }
@@ -205,7 +201,6 @@ refexport_t    *GetRefAPI( int, refimport_t* )
     re.RegisterSkin = RE_RegisterSkin;
     re.RegisterShader = RE_RegisterShader;
     re.RegisterFont = RE_RegisterFont;
-    re.Glyph = RE_Glyph;
     re.GlyphChar = RE_GlyphChar;
     re.UnregisterFont = RE_UnregisterFont;
     re.LoadWorld = RE_LoadWorldMap;

src/engine/qcommon/q_shared.h

@@ -2156,8 +2156,6 @@ union OpaquePlayerState {
 
 #define GLYPH_START     0
 #define GLYPH_END       255
-#define GLYPH_CHARSTART 32
-#define GLYPH_CHAREND   127
 #define GLYPHS_PER_FONT ( GLYPH_END - GLYPH_START + 1 )
 struct glyphInfo_t
 {
@@ -2186,8 +2184,6 @@ struct fontInfo_t
 	void         *face, *faceData;
 	glyphInfo_t  *glyphBlock[0x110000 / 256]; // glyphBlock_t
 	int           pointSize;
-	int           height;
-	float         glyphScale;
 	char          name[ MAX_QPATH ];
 };
 

src/engine/renderer/tr_font.cpp

@@ -360,11 +360,6 @@ void RE_GlyphChar( fontInfo_t *font, int ch, glyphInfo_t *glyph )
 	*glyph = font->glyphBlock[ ch / 256][ ch % 256 ];
 }
 
-void RE_Glyph( fontInfo_t *font, const char *str, glyphInfo_t *glyph )
-{
-	RE_GlyphChar( font, Q_UTF8_CodePoint( str ), glyph );
-}
-
 static void RE_StoreImage( fontInfo_t *font, int chunk, int page, int from, int to, const unsigned char *bitmap, int yEnd )
 {
 	int           scaledSize = FONT_SIZE * FONT_SIZE;
@@ -642,7 +637,6 @@ fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize )
 	if ( len > 0x5004 && len <= 0x5004 + MAX_QPATH ) // 256 glyphs, scale info, and the bitmap name
 	{
 		glyphInfo_t *glyphs;
-		int height = 0;
 
 		ri.FS_ReadFile( fileName, &faceData );
 		fdOffset = 0;
@@ -652,13 +646,7 @@ fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize )
 
 		for ( i = 0; i < GLYPHS_PER_FONT; i++ )
 		{
-			glyphs[ i ].height = readInt();
-
-			if ( glyphs[ i ].height > height )
-			{
-				height = glyphs[ i ].height;
-			}
-
+			/* height */ readInt();
 			glyphs[ i ].top = readInt();
 			glyphs[ i ].bottom = readInt();
 			glyphs[ i ].pitch = readInt();
@@ -675,8 +663,7 @@ fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize )
 		}
 
 		font->pointSize = pointSize;
-		font->height = height;
-		font->glyphScale = readFloat();
+		/* glyphScale */ readFloat();
 		Q_strncpyz( font->name, registeredName, sizeof( font->name ) );
 
 		ri.FS_FreeFile( faceData );
@@ -728,8 +715,6 @@ fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize )
 	font->face = face;
 	font->faceData = faceData;
 	font->pointSize = pointSize;
-	font->glyphScale = 64.0f / pointSize;
-	font->height = ceil( ( face->height / 64.0 ) * ( face->size->metrics.y_scale / 65536.0 ) * font->glyphScale );
 
 	RE_RenderChunk( font, 0 );
 

src/engine/renderer/tr_init.cpp

@@ -1660,7 +1660,6 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 		re.SetMatrixTransform = RE_SetMatrixTransform;
 		re.ResetMatrixTransform = RE_ResetMatrixTransform;
 
-		re.Glyph = RE_Glyph;
 		re.GlyphChar = RE_GlyphChar;
 		re.RegisterFont = RE_RegisterFont;
 		re.UnregisterFont = RE_UnregisterFont;

src/engine/renderer/tr_local.h

@@ -3668,7 +3668,6 @@ void GLimp_LogComment_( std::string comment );
 	void       R_DoneFreeType();
 	fontInfo_t* RE_RegisterFont( const char *fontName, int pointSize );
 	void       RE_UnregisterFont( fontInfo_t *font );
-	void       RE_Glyph(fontInfo_t *font, const char *str, glyphInfo_t *glyph);
 	void       RE_GlyphChar(fontInfo_t *font, int ch, glyphInfo_t *glyph);
 
 	void       R_SetAltShaderTokens( const char * );