vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Menu-FN: Add a hack around drawtextfield(), wasting QC asm instructions in

Browse source 
the process for something as simple as specifying character size.
This commit is contained in:
Marco Cawthorne 2021-11-06 11:17:54 +01:00
parent 24070f9e37
commit a48baff2d1
Signed by: eukara
GPG key ID: C196CD8BA993248A
4 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/base_scripts.pk3dir/fonts/menu_header.font
View file

@ -1,2 +1,3 @@
rendersize "16 21" rendersize "21 16"
path gfx/shell/arialbd.ttf path gfx/shell/arialbd.ttf
size 16

3
platform/base_scripts.pk3dir/fonts/menu_main.font
View file

@ -1,2 +1,3 @@
rendersize "14 11 12" rendersize "14 11 12"
path gfx/shell/arial.ttf path gfx/shell/arial.ttf
size 12

16
src/client/font.qc
View file

@ -29,7 +29,7 @@ Font_Load(string strFile, font_s &fntNew)
filestream fileFont = fopen(strFile, FILE_READ); filestream fileFont = fopen(strFile, FILE_READ);
fntNew.iID = 0; fntNew.iID = 0;
fntNew.iScaleX = fntNew.iScaleY = 8; fntNew.iScaleX = fntNew.iScaleY = -1;
fntNew.vecColor = [1,1,1]; fntNew.vecColor = [1,1,1];
fntNew.flAlpha = 1.0f; fntNew.flAlpha = 1.0f;
fntNew.iFlags = 0; fntNew.iFlags = 0;
@ -72,7 +72,11 @@ Font_Load(string strFile, font_s &fntNew)
} }
fclose(fileFont); fclose(fileFont);
} else { } else {
error(sprintf("[MENU] Cannot load font file %s!", strFile)); error(sprintf("[FONT] Cannot load font file %s!", strFile));
}
if (!fntNew.iScaleX || !fntNew.iScaleY) {
error(sprintf("[FONT] No valid size defined for %s!", strFile));
} }
//print(sprintf("[FONT] %s: %s %s\n", strFile, strFontPath, strRenderSize)); //print(sprintf("[FONT] %s: %s %s\n", strFile, strFontPath, strRenderSize));
@ -88,6 +92,7 @@ Font_DrawText(vector vecOrigin, string strText, font_s fnt)
{ {
drawfont = (float)fnt.iID; drawfont = (float)fnt.iID;
drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], fnt.vecColor, fnt.flAlpha, (float)fnt.iFlags); drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], fnt.vecColor, fnt.flAlpha, (float)fnt.iFlags);
drawfont = 0;
} }
void void
@ -95,6 +100,7 @@ Font_DrawText_A(vector vecOrigin, string strText, vector rgb, float a, font_s fn
{ {
drawfont = (float)fnt.iID; drawfont = (float)fnt.iID;
drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], fnt.vecColor, a, (float)fnt.iFlags); drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], fnt.vecColor, a, (float)fnt.iFlags);
drawfont = 0;
} }
void void
@ -102,6 +108,7 @@ Font_DrawText_RGB(vector vecOrigin, string strText, vector rgb, font_s fnt)
{ {
drawfont = (float)fnt.iID; drawfont = (float)fnt.iID;
drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], rgb, fnt.flAlpha, (float)fnt.iFlags); drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], rgb, fnt.flAlpha, (float)fnt.iFlags);
drawfont = 0;
} }
void void
@ -109,13 +116,18 @@ Font_DrawText_RGBA(vector vecOrigin, string strText, vector rgb, float a, font_s
{ {
drawfont = (float)fnt.iID; drawfont = (float)fnt.iID;
drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], rgb, a, (float)fnt.iFlags); drawstring(vecOrigin, strText, [fnt.iScaleX, fnt.iScaleY], rgb, a, (float)fnt.iFlags);
drawfont = 0;
} }
void void
Font_DrawField(vector vecOrigin, vector vecSize, string strText, font_s fnt, int iAlignFlags) Font_DrawField(vector vecOrigin, vector vecSize, string strText, font_s fnt, int iAlignFlags)
{ {
drawfont = (float)fnt.iID; drawfont = (float)fnt.iID;
drawfontscale[0] = (float)fnt.iScaleX / 8;
drawfontscale[1] = (float)fnt.iScaleY / 8;
drawtextfield(vecOrigin, vecSize, (float)iAlignFlags, strText); drawtextfield(vecOrigin, vecSize, (float)iAlignFlags, strText);
drawfont = 0;
drawfontscale = [1,1,0];
} }
string string

5
src/menu-fn/w_label.qc
View file

@ -62,15 +62,14 @@ WLabel_StaticR(int x, int y, string msg, int sx, int sy, vector col,
x += g_menuofs[0] - stringwidth(msg, TRUE,[sx,sy]); x += g_menuofs[0] - stringwidth(msg, TRUE,[sx,sy]);
y += g_menuofs[1]; y += g_menuofs[1];
drawstring([x,y], msg, [sx,sy], col, alpha, flags); drawstring([x,y], msg, [sx,sy], col, alpha, flags);
drawfont = 0;
} }
void void
WField_Static(int x, int y, string msg, int sx, int sy, vector col, WField_Static(int x, int y, string msg, int sx, int sy, vector col,
float alpha, float flags, font_s font) float alpha, float flags, font_s font)
{ {
drawfont = Font_GetID(font);
x += g_menuofs[0]; x += g_menuofs[0];
y += g_menuofs[1]; y += g_menuofs[1];
drawtextfield([x,y], [sx,sy], flags, sprintf("%s%s", Font_DrawField([x,y], [sx,sy], sprintf("%s%s", Colors_RGB8_to_HEX(col), msg), font, (int)flags);
Colors_RGB8_to_HEX(col), msg));
} }