nzp-team
/
quakespasm
mirror of https://github.com/nzp-team/quakespasm.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NX/VITA: WIP Font Kerning Implementation

This commit is contained in:
cypress 2024-08-31 13:56:12 -07:00
parent 3d9454ec52
commit 067ef74e80
5 changed files with 202 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/draw.h
View File

@ -52,9 +52,11 @@ extern float loading_cur_step;
extern int loading_step; extern int loading_step;
extern char loading_name[32]; extern char loading_name[32];
extern float loading_num_step; extern float loading_num_step;
extern int font_kerningamount[96];
void Draw_ColoredString (int x, int y, const char *str, float r, float g, float b, float a); void Draw_ColoredString (int x, int y, const char *str, float r, float g, float b, float a);
void Draw_ColoredStringScale (int x, int y, const char *str, float r, float g, float b, float a, float s); void Draw_ColoredStringScale (int x, int y, const char *str, float r, float g, float b, float a, float s);
void Draw_ColoredStringCentered(int y, char *text, float r, float g, float b, float a, float s);
qpic_t *Draw_PicFromWad (const char *name); qpic_t *Draw_PicFromWad (const char *name);
qpic_t *Draw_CachePic (const char *path); qpic_t *Draw_CachePic (const char *path);
void Draw_NewGame (void); void Draw_NewGame (void);
@ -62,6 +64,7 @@ void Draw_NewGame (void);
void GL_SetCanvas (canvastype newcanvas); //johnfitz void GL_SetCanvas (canvastype newcanvas); //johnfitz
void Clear_LoadingFill (void); void Clear_LoadingFill (void);
gltexture_t *loadtextureimage (char* filename); gltexture_t *loadtextureimage (char* filename);
int getTextWidth(char *str, int scale);
#endif /* _QUAKE_DRAW_H */ #endif /* _QUAKE_DRAW_H */

110
source/gl_draw.c
View File

@ -448,6 +448,40 @@ void Draw_NewGame (void)
menu_numcachepics = 0; menu_numcachepics = 0;
} }
// ! " # $ % & ' ( ) * _ , - . / 0
// 1 2 3 4 5 6 7 8 9 : ; < = > ? @
// A B C D E F G H I J K L M N O P
// Q R S T U V W X Y Z [ \ ] ^ _ `
// a b c d e f g h i j k l m n o p
// q r s t u v w x y z { | } ~
int font_kerningamount[96];
void InitKerningMap(void)
{
// Initialize the kerning amount as 8px for each
// char in the event we cant load the file.
for(int i = 0; i < 96; i++) {
font_kerningamount[i] = 8;
}
FILE *kerning_map = fopen(va("%s/gfx/kerning_map.txt", com_gamedir), "r");
if (kerning_map == NULL) {
return;
}
char buffer[1024];
if (fgets(buffer, sizeof(buffer), kerning_map) != NULL) {
char *token = strtok(buffer, ",");
int i = 0;
while (token != NULL && i < 96) {
font_kerningamount[i++] = atoi(token);
token = strtok(NULL, ",");
}
}
fclose(kerning_map);
}
/* /*
=============== ===============
Draw_Init -- johnfitz -- rewritten Draw_Init -- johnfitz -- rewritten
@ -478,6 +512,7 @@ void Draw_Init (void)
// load game pics // load game pics
Draw_LoadPics (); Draw_LoadPics ();
Clear_LoadingFill (); Clear_LoadingFill ();
InitKerningMap();
} }
//============================================================================== //==============================================================================
@ -684,8 +719,17 @@ void Draw_ColoredStringScale (int x, int y, const char *str, float r, float g, f
{ {
if (*str != 32) //don't waste verts on spaces if (*str != 32) //don't waste verts on spaces
Draw_CharacterQuadScale (x, y, *str, s); Draw_CharacterQuadScale (x, y, *str, s);
// Hooray for variable-spacing!
if (*str == ' ')
x += 4 * s;
else if ((int)*str < 33 || (int)*str > 126)
x += 8 * s;
else
x += (font_kerningamount[(int)(*str - 33)] + 1) * s;
str++; str++;
x += 8*s; //x += 8*s;
} }
glEnd (); glEnd ();
@ -696,41 +740,36 @@ void Draw_ColoredStringScale (int x, int y, const char *str, float r, float g, f
glColor4f (1,1,1,1); glColor4f (1,1,1,1);
} }
int getTextWidth(char *str, int scale)
/*
================
Draw_ColoredString
Assume that all rgba values are divided by 255 already
================
*/
void Draw_ColoredString (int x, int y, const char *str, float r, float g, float b, float a)
{ {
if (y <= -8) int width = 0;
return; // totally off screen
glEnable (GL_BLEND); for (int i = 0; i < strlen(str); i++) {
glColor4f(r, g, b, a); // Hooray for variable-spacing!
glDisable (GL_ALPHA_TEST); if (str[i] == ' ')
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); width += 4 * scale;
else if ((int)str[i] < 33 || (int)str[i] > 126)
width += 8 * scale;
else
width += (font_kerningamount[(int)(str[i] - 33)] + 1) * scale;
}
GL_Bind (char_texture); return width;
glBegin (GL_QUADS); }
while (*str)
{
if (*str != 32) //don't waste verts on spaces
Draw_CharacterQuad (x, y, *str);
str++;
x += 8;
}
glEnd (); void Draw_ColoredStringCentered(int y, char *str, float r, float g, float b, float a, float s)
{
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); #ifdef VITA
glEnable(GL_ALPHA_TEST);
glDisable (GL_BLEND); Draw_ColoredStringScale((vid.width - getTextWidth(str, (int)s))/2, y, str, r, g, b, a, s);
glColor4f (1,1,1,1);
#else
Draw_ColoredStringScale((640 - getTextWidth(str, (int)s))/2, y, str, r, g, b, a, s);
#endif // VITA
} }
@ -1084,7 +1123,6 @@ void Draw_LoadingFill(void)
#endif // VITA #endif // VITA
int l;
char str[64]; char str[64];
char* text; char* text;
@ -1110,15 +1148,17 @@ void Draw_LoadingFill(void)
default: text = "Initializing.."; break; default: text = "Initializing.."; break;
} }
l = strlen (text);
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale((vid.width - l*16)/2, y, text, 1, 1, 1, 1, 2.0f); Draw_ColoredStringCentered(y, text, 1, 1, 1, 1, 2.0f);
//Draw_ColoredStringScale((vid.width - l*16)/2, y, text, 1, 1, 1, 1, 2.0f);
#else #else
Draw_String((640 - l*8)/2, y, text); Draw_ColoredStringCentered(y, text, 1, 1, 1, 1, 1.0f);
//Draw_String((640 - l*8)/2, y, text);
#endif // VITA #endif // VITA

60
source/gl_hud.c
View File

@ -322,8 +322,8 @@ void HUD_EndScreen (void)
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale(vid.width/2 - strlen("GAME OVER")*16, 110, "GAME OVER", 1, 1, 1, 1, 4.0f); Draw_ColoredStringCentered(110, "GAME OVER", 1, 1, 1, 1, 4.0f);
Draw_ColoredStringScale(vid.width/2 - strlen(str)*8, 150, str, 1, 1, 1, 1, 2.0f); Draw_ColoredStringCentered(150, str, 1, 1, 1, 1, 2.0f);
Draw_ColoredStringScale(vid.width/2 + 40, 185, "Points", 1, 1, 1, 1, 2.0f); Draw_ColoredStringScale(vid.width/2 + 40, 185, "Points", 1, 1, 1, 1, 2.0f);
Draw_ColoredStringScale(vid.width/2 + 240, 185, "Kills", 1, 1, 1, 1, 2.0f); Draw_ColoredStringScale(vid.width/2 + 240, 185, "Kills", 1, 1, 1, 1, 2.0f);
@ -354,8 +354,8 @@ void HUD_EndScreen (void)
#else #else
Draw_ColoredStringScale(vid.width/4 - strlen("GAME OVER")*8, vid.height*3/4 - 98, "GAME OVER", 1, 1, 1, 1, 2.0f); Draw_ColoredStringCentered(vid.height*3/4 - 98, "GAME OVER", 1, 1, 1, 1, 2.0f);
Draw_ColoredStringScale(vid.width/4 - strlen(str)*6, vid.height*3/4 - 70, str, 1, 1, 1, 1, 1.5f); Draw_ColoredStringCentered(vid.height*3/4 - 70, str, 1, 1, 1, 1, 1.5f);
Draw_ColoredStringScale(vid.width/4 + 35, vid.height*3/4 - 40, "Points", 1, 1, 1, 1, 1.25f); Draw_ColoredStringScale(vid.width/4 + 35, vid.height*3/4 - 40, "Points", 1, 1, 1, 1, 1.25f);
Draw_ColoredStringScale(vid.width/4 + 130, vid.height*3/4 - 40, "Kills", 1, 1, 1, 1, 1.25f); Draw_ColoredStringScale(vid.width/4 + 130, vid.height*3/4 - 40, "Kills", 1, 1, 1, 1, 1.25f);
@ -530,10 +530,10 @@ void HUD_Points (void)
#endif // VITA #endif // VITA
#ifdef VITA #ifdef VITA
xplus = HUD_itoa (f, str)*16; xplus = getTextWidth(HUD_itoa (f, str), 2.0f);
Draw_ColoredStringScale (((160 - xplus)/2)-point_x_offset, 413 - (35 * i), va("%i", current_points[i]), r, g, b, 1, 2.0f); //2x Scale/White Draw_ColoredStringScale (((160 - xplus)/2)-point_x_offset, 413 - (35 * i), va("%i", current_points[i]), r, g, b, 1, 2.0f); //2x Scale/White
#else #else
xplus = HUD_itoa (f, str)*12; xplus = getTextWidth(HUD_itoa (f, str), 1.5f);
Draw_ColoredStringScale (((111 - xplus)/2)-point_x_offset, 633 - (24 * i), va("%i", current_points[i]), r, g, b, 1, 1.5f); Draw_ColoredStringScale (((111 - xplus)/2)-point_x_offset, 633 - (24 * i), va("%i", current_points[i]), r, g, b, 1, 1.5f);
#endif // VITA #endif // VITA
@ -659,15 +659,7 @@ void HUD_MaxAmmo(void)
maxammoy -= cl.time * 0.003; maxammoy -= cl.time * 0.003;
maxammoopac -= cl.time * 0.05; maxammoopac -= cl.time * 0.05;
#ifdef VITA Draw_ColoredStringCentered(maxammoy, "MAX AMMO!", 1, 1, 1, maxammoopac/255, 2.0f);
Draw_ColoredStringScale(vid.width/2 - strlen("MAX AMMO!")*8, maxammoy, "MAX AMMO!", 255, 255, 255, maxammoopac/255, 2.0f);
#else
Draw_ColoredStringScale(vid.width/4 - strlen("MAX AMMO!")*8, maxammoy, "MAX AMMO!", 255, 255, 255, maxammoopac/255, 2.0f);
#endif // VITA
if (maxammoopac <= 0) { if (maxammoopac <= 0) {
domaxammo = false; domaxammo = false;
@ -794,11 +786,11 @@ void HUD_Rounds (void)
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale(vid.width/2 - strlen("Round")*16, 160, "Round", 1, value/255, value/255, 1, 4.0f); Draw_ColoredStringCentered(160, "Round", 1, value/255, value/255, 1, 4.0f);
#else #else
Draw_ColoredStringScale(vid.width/4 - strlen("Round")*8, vid.height*3/4 - sb_round[0]->height - 10, "Round", 1, value/255, value/255, 1, 2.0f); Draw_ColoredStringCentered(vid.height*3/4 - sb_round[0]->height - 10, "Round", 1, value/255, value/255, 1, 2.0f);
#endif // VITA #endif // VITA
@ -817,11 +809,11 @@ void HUD_Rounds (void)
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale(vid.width/2 - strlen("Round")*16, 160, "Round", 1, 0, 0, value/255, 4.0f); Draw_ColoredStringCentered(160, "Round", 1, 0, 0, value/255, 4.0f);
#else #else
Draw_ColoredStringScale(vid.width/4 - strlen("Round")*8, vid.height*3/4 - sb_round[0]->height - 10, "Round", 1, 0, 0, value/255, 2.0f); Draw_ColoredStringCentered(vid.height*3/4 - sb_round[0]->height - 10, "Round", 1, 0, 0, value/255, 2.0f);
#endif // VITA #endif // VITA
@ -1757,16 +1749,16 @@ void HUD_Ammo (void)
#endif // VITA #endif // VITA
reslen = strlen(va("/%i", cl.stats[STAT_AMMO])); reslen = getTextWidth(va("/%i", cl.stats[STAT_AMMO]), scale);
// //
// Magazine // Magazine
// //
magstring = va("%i", cl.stats[STAT_CURRENTMAG]); magstring = va("%i", cl.stats[STAT_CURRENTMAG]);
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 1) >= cl.stats[STAT_CURRENTMAG]) { if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 1) >= cl.stats[STAT_CURRENTMAG]) {
Draw_ColoredStringScale((x_value - (reslen*8*scale)) - strlen(magstring)*8*scale, y_value, magstring, 1, 0, 0, 1, scale); Draw_ColoredStringScale((x_value - reslen) - getTextWidth(magstring, scale), y_value, magstring, 1, 0, 0, 1, scale);
} else { } else {
Draw_ColoredStringScale((x_value - (reslen*8*scale)) - strlen(magstring)*8*scale, y_value, magstring, 1, 1, 1, 1, scale); Draw_ColoredStringScale((x_value - reslen) - getTextWidth(magstring, scale), y_value, magstring, 1, 1, 1, 1, scale);
} }
// //
@ -1774,9 +1766,9 @@ void HUD_Ammo (void)
// //
magstring = va("/%i", cl.stats[STAT_AMMO]); magstring = va("/%i", cl.stats[STAT_AMMO]);
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 0) >= cl.stats[STAT_AMMO]) { if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 0) >= cl.stats[STAT_AMMO]) {
Draw_ColoredStringScale(x_value - strlen(magstring)*8*scale, y_value, magstring, 1, 0, 0, 1, scale); Draw_ColoredStringScale(x_value - getTextWidth(magstring, scale), y_value, magstring, 1, 0, 0, 1, scale);
} else { } else {
Draw_ColoredStringScale(x_value - strlen(magstring)*8*scale, y_value, magstring, 1, 1, 1, 1, scale); Draw_ColoredStringScale(x_value - getTextWidth(magstring, scale), y_value, magstring, 1, 1, 1, 1, scale);
} }
// //
@ -1785,9 +1777,9 @@ void HUD_Ammo (void)
if (IsDualWeapon(cl.stats[STAT_ACTIVEWEAPON])) { if (IsDualWeapon(cl.stats[STAT_ACTIVEWEAPON])) {
magstring = va("%i", cl.stats[STAT_CURRENTMAG2]); magstring = va("%i", cl.stats[STAT_CURRENTMAG2]);
if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 0) >= cl.stats[STAT_CURRENTMAG2]) { if (GetLowAmmo(cl.stats[STAT_ACTIVEWEAPON], 0) >= cl.stats[STAT_CURRENTMAG2]) {
Draw_ColoredStringScale(x_value - 34*scale - strlen(magstring)*8*scale, y_value, magstring, 1, 0, 0, 1, scale); Draw_ColoredStringScale(x_value - 34*scale - getTextWidth(magstring, scale), y_value, magstring, 1, 0, 0, 1, scale);
} else { } else {
Draw_ColoredStringScale(x_value - 34*scale - strlen(magstring)*8*scale, y_value, magstring, 1, 1, 1, 1, scale); Draw_ColoredStringScale(x_value - 34*scale - getTextWidth(magstring, scale), y_value, magstring, 1, 1, 1, 1, scale);
} }
} }
} }
@ -1806,21 +1798,21 @@ void HUD_AmmoString (void)
{ {
if (0 < cl.stats[STAT_AMMO] && cl.stats[STAT_CURRENTMAG] >= 0) { if (0 < cl.stats[STAT_AMMO] && cl.stats[STAT_CURRENTMAG] >= 0) {
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale ((vid.width)/2 - 43, (vid.height)/2 + 34, "Reload", 1, 1, 1, 1, 2.0f); Draw_ColoredStringCentered((vid.height)/2 + 34, "Reload", 1, 1, 1, 1, 2.0f);
#else #else
Draw_ColoredStringScale(vid.width/4 - strlen("Reload")*6, (vid.height)*3/4 + 40, "Reload", 1, 1, 1, 1, 1.5f); Draw_ColoredStringCentered((vid.height)*3/4 + 40, "Reload", 1, 1, 1, 1, 1.5f);
#endif #endif
} else if (0 < cl.stats[STAT_CURRENTMAG]) { } else if (0 < cl.stats[STAT_CURRENTMAG]) {
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale ((vid.width)/2 - 73, (vid.height)/2 + 34, "LOW AMMO", 1, 1, 0, 1, 2.5f); Draw_ColoredStringCentered((vid.height)/2 + 34, "LOW AMMO", 1, 1, 0, 1, 2.0f);
#else #else
Draw_ColoredStringScale(vid.width/4 - strlen("LOW AMMO")*6, (vid.height)*3/4 + 40, "LOW AMMO", 1, 1, 0, 1, 1.5f); Draw_ColoredStringCentered((vid.height)*3/4 + 40, "LOW AMMO", 1, 1, 0, 1, 1.5f);
#endif #endif
} else { } else {
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale ((vid.width)/2 - 66, (vid.height)/2 + 34, "NO AMMO", 1, 0, 0, 1, 2.5f); Draw_ColoredStringCentered((vid.height)/2 + 34, "NO AMMO", 1, 0, 0, 1, 2.0f);
#else #else
Draw_ColoredStringScale(vid.width/4 - strlen("NO AMMO")*6, (vid.height)*3/4 + 40, "NO AMMO", 1, 0, 0, 1, 1.5f); Draw_ColoredStringCentered((vid.height)*3/4 + 40, "NO AMMO", 1, 0, 0, 1, 1.5f);
#endif #endif
} }
} }
@ -2013,10 +2005,10 @@ void HUD_Weapon (void)
//strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON])); //strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON]));
l = strlen(str); l = strlen(str);
#ifdef VITA #ifdef VITA
x_value = vid.width - fragpic->width - 65 - l*16; x_value = vid.width - fragpic->width - 65 - getTextWidth(str, 2);
Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 2.0f); Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 2.0f);
#else #else
x_value = vid.width/2 - 63 - l*10; x_value = vid.width/2 - 63 - getTextWidth(str, 1);
Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 1.25f); Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 1.25f);
#endif #endif
} }

148
source/gl_screen.c
View File

@ -322,6 +322,16 @@ void SCR_UsePrint (int type, int cost, int weapon)
char s[128]; char s[128];
char c[128]; char c[128];
#ifdef VITA
float scale = 2.0f;
#else
float scale = 1.25f;
#endif // VITA
switch (type) switch (type)
{ {
case 0://clear case 0://clear
@ -329,42 +339,42 @@ void SCR_UsePrint (int type, int cost, int weapon)
strcpy(c, ""); strcpy(c, "");
break; break;
case 1://door case 1://door
strcpy(s, va("Hold %s to open Door\n", GetUseButtonL())); strcpy(s, va("Hold %s to open Door\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 2://debris case 2://debris
strcpy(s, va("Hold %s to remove Debris\n", GetUseButtonL())); strcpy(s, va("Hold %s to remove Debris\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 3://ammo case 3://ammo
strcpy(w, cl.touchname); strcpy(w, cl.touchname);
strcpy(s, va("Hold %s to buy Ammo for %s\n", GetUseButtonL(), w)); strcpy(s, va("Hold %s to buy Ammo for %s\n", GetUseButtonL(), w));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 4://weapon case 4://weapon
strcpy(w, cl.touchname); strcpy(w, cl.touchname);
strcpy(s, va("Hold %s to buy %s\n", GetUseButtonL(), w)); strcpy(s, va("Hold %s to buy %s\n", GetUseButtonL(), w));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 5://window case 5://window
strcpy(s, va("Hold %s to Rebuild Barrier\n", GetUseButtonL())); strcpy(s, va("Hold %s to Rebuild Barrier\n", GetUseButtonL()));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 6://box case 6://box
strcpy(s, va("Hold %s for Mystery Box\n", GetUseButtonL())); strcpy(s, va("Hold %s for Mystery Box\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 7://box take case 7://box take
strcpy(w, cl.touchname); strcpy(w, cl.touchname);
strcpy(s, va("Hold %s for %s\n", GetUseButtonL(), w)); strcpy(s, va("Hold %s for %s\n", GetUseButtonL(), w));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 8://power case 8://power
strcpy(s, "The Power must be Activated first\n"); strcpy(s, "The Power must be Activated first\n");
@ -372,39 +382,39 @@ void SCR_UsePrint (int type, int cost, int weapon)
button_pic_x = 100; button_pic_x = 100;
break; break;
case 9://perk case 9://perk
strcpy(s, va("Hold %s to buy %s\n", GetUseButtonL(), GetPerkName(weapon))); strcpy(s, va("Hold %s to buy %s\n", GetUseButtonL(), GetPerkName(weapon)));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 10://turn on power case 10://turn on power
strcpy(s, va("Hold %s to Turn On the Power\n", GetUseButtonL())); strcpy(s, va("Hold %s to Turn On the Power\n", GetUseButtonL()));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 11://turn on trap case 11://turn on trap
strcpy(s, va("Hold %s to Activate the Trap\n", GetUseButtonL())); strcpy(s, va("Hold %s to Activate the Trap\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 12://PAP case 12://PAP
strcpy(s, va("Hold %s to Pack-a-Punch\n", GetUseButtonL())); strcpy(s, va("Hold %s to Pack-a-Punch\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 13://revive case 13://revive
strcpy(s, va("Hold %s to Fix your Code.. :)\n", GetUseButtonL())); strcpy(s, va("Hold %s to Fix your Code.. :)\n", GetUseButtonL()));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 14://use teleporter (free) case 14://use teleporter (free)
strcpy(s, va("Hold %s to use Teleporter\n", GetUseButtonL())); strcpy(s, va("Hold %s to use Teleporter\n", GetUseButtonL()));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 15://use teleporter (cost) case 15://use teleporter (cost)
strcpy(s, va("Hold %s to use Teleporter\n", GetUseButtonL())); strcpy(s, va("Hold %s to use Teleporter\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 16://tp cooldown case 16://tp cooldown
strcpy(s, "Teleporter is cooling down\n"); strcpy(s, "Teleporter is cooling down\n");
@ -412,9 +422,9 @@ void SCR_UsePrint (int type, int cost, int weapon)
button_pic_x = 100; button_pic_x = 100;
break; break;
case 17://link case 17://link
strcpy(s, va("Hold %s to initiate link to pad\n", GetUseButtonL())); strcpy(s, va("Hold %s to initiate link to pad\n", GetUseButtonL()));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 18://no link case 18://no link
strcpy(s, "Link not active\n"); strcpy(s, "Link not active\n");
@ -422,14 +432,14 @@ void SCR_UsePrint (int type, int cost, int weapon)
button_pic_x = 100; button_pic_x = 100;
break; break;
case 19://finish link case 19://finish link
strcpy(s, va("Hold %s to link pad with core\n", GetUseButtonL())); strcpy(s, va("Hold %s to link pad with core\n", GetUseButtonL()));
strcpy(c, ""); strcpy(c, "");
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
case 20://buyable ending case 20://buyable ending
strcpy(s, va("Hold %s to End the Game\n", GetUseButtonL())); strcpy(s, va("Hold %s to End the Game\n", GetUseButtonL()));
strcpy(c, va("[Cost: %i]\n", cost)); strcpy(c, va("[Cost: %i]\n", cost));
button_pic_x = 5; button_pic_x = getTextWidth("Hold ", (int)scale);
break; break;
default: default:
Con_Printf ("No type defined in engine for useprint\n"); Con_Printf ("No type defined in engine for useprint\n");
@ -443,8 +453,7 @@ void SCR_UsePrint (int type, int cost, int weapon)
void SCR_DrawUseString (void) void SCR_DrawUseString (void)
{ {
int l, l2; int x, y;
int x, x2, y;
if (cl.stats[STAT_HEALTH] < 0) { if (cl.stats[STAT_HEALTH] < 0) {
return; return;
@ -452,32 +461,39 @@ void SCR_DrawUseString (void)
#ifdef VITA #ifdef VITA
float scale = 1.0f; float scale = 2.0f;
y = vid.height * 0.65;
#else #else
float scale = 1.25f; float scale = 1.25f;
y = vid.height * 0.85;
#endif // VITA #endif // VITA
// The scale is double, so basically subtract the difference here... x = (vid.width - getTextWidth(scr_usestring, scale))/2;
y = vid.height*0.85;
l = strlen (scr_usestring); #ifndef VITA
x = ((vid.width/2 - l*8*scale)/2);
l2 = strlen (scr_usestring2);
x2 = ((vid.width/2 - l2*8*scale)/2);
#ifdef VITA
GL_SetCanvas(CANVAS_HUD);
#else
GL_SetCanvas(CANVAS_USEPRINT); GL_SetCanvas(CANVAS_USEPRINT);
#endif
Draw_ColoredStringScale(x, y, scr_usestring, 1, 1, 1, 1, scale); #endif // VITA
Draw_ColoredStringScale(x2, y + 12*scale, scr_usestring2, 1, 1, 1, 1, scale);
Draw_ColoredStringCentered(y, scr_usestring, 1, 1, 1, 1, scale);
Draw_ColoredStringCentered(y + 12 * scale, scr_usestring2, 1, 1, 1, 1, scale);
GL_SetCanvas(CANVAS_DEFAULT); GL_SetCanvas(CANVAS_DEFAULT);
Draw_Pic (x*2 + button_pic_x*16*scale, y*0.8125, GetButtonIcon("+use"));
#ifdef VITA
Draw_Pic ((x + button_pic_x), y - 8, GetButtonIcon("+use"));
#else
Draw_Pic (x*2 + button_pic_x*16*scale, y*0.8125, GetButtonIcon("+use"));
#endif // VITA
} }
void SCR_CheckDrawUseString (void) void SCR_CheckDrawUseString (void)
@ -575,16 +591,16 @@ void SCR_DrawCenterString (void) //actually do the drawing
#ifndef VITA #ifndef VITA
int scale = 8; int scale = 1;
#else #else
int scale = 16; int scale = 2;
#endif // VITA #endif // VITA
x = (320 - l*scale)/2; //johnfitz -- 320x200 coordinate system x = (320 - getTextWidth(start, scale))/2; //johnfitz -- 320x200 coordinate system
for (j=0 ; j<l ; j++, x+=scale) for (j=0 ; j<l ; j++)
{ {
#ifndef VITA #ifndef VITA
@ -597,11 +613,19 @@ void SCR_DrawCenterString (void) //actually do the drawing
#endif // VITA #endif // VITA
// Hooray for variable-spacing!
if (start[j] == ' ')
x += 4 * scale;
else if ((int)start[j] < 33 || (int)start[j] > 126)
x += 8 * scale;
else
x += (font_kerningamount[(int)(start[j] - 33)] + 1) * scale;
if (!remaining--) if (!remaining--)
return; return;
} }
y += scale; y += scale * 8;
while (*start && *start != '\n') while (*start && *start != '\n')
start++; start++;
@ -1086,7 +1110,6 @@ SCR_DrawLoadScreen
double loadingtimechange; double loadingtimechange;
int loadingdot; int loadingdot;
int loadingtextwidth;
char *lodinglinetext; char *lodinglinetext;
qpic_t *awoo; qpic_t *awoo;
char *ReturnLoadingtex (void) char *ReturnLoadingtex (void)
@ -1387,22 +1410,21 @@ void SCR_DrawLoadScreen (void)
if (loadingtimechange < Sys_DoubleTime ()) { if (loadingtimechange < Sys_DoubleTime ()) {
lodinglinetext = ReturnLoadingtex(); lodinglinetext = ReturnLoadingtex();
loadingtextwidth = strlen(lodinglinetext); //strlen(lodinglinetext)*8
loadingtimechange = Sys_DoubleTime () + 5; loadingtimechange = Sys_DoubleTime () + 5;
} }
if (key_dest == key_game) { if (key_dest == key_game) {
#ifdef VITA #ifdef VITA
Draw_ColoredStringScale((vid.width - loadingtextwidth*16)/2, 544 - 16 - 8, lodinglinetext, 255, 255, 255, 255, 2.0f);
//if (strcmp(lodinglinetext, "Please help me find the meaning of . Thanks.") == 0) { Draw_ColoredStringCentered(544 - 16 - 8, lodinglinetext, 1, 1, 1, 1, 2.0f);
//Draw_Pic(335, 255, awoo);
#else #else
Draw_ColoredStringScale((640 - loadingtextwidth*10)/2, 342, lodinglinetext, 255, 255, 255, 255, 1.25f);
//if (strcmp(lodinglinetext, "Please help me find the meaning of . Thanks.") == 0) Draw_ColoredStringCentered(342, lodinglinetext, 1, 1, 1, 1, 1.25f);
//Draw_StretchPic(335, 337, awoo, 17, 17);
#endif // VITA #endif // VITA
} }
} }

38
source/menu.c
View File

@ -214,7 +214,7 @@ int menu_offset_y;
#define MENU_INITVARS() int y = 0; menu_offset_y = y + 70; #define MENU_INITVARS() int y = 0; menu_offset_y = y + 70;
#define DRAW_HEADER(title) Draw_ColoredStringScale(10, y + 10, title, 1, 1, 1, 1, 4.0f); #define DRAW_HEADER(title) Draw_ColoredStringScale(10, y + 10, title, 1, 1, 1, 1, 4.0f);
#define DRAW_VERSIONSTRING() Draw_ColoredStringScale(vid.width - (strlen(game_build_date) * 16), y + 5, game_build_date, 1, 1, 1, 1, 2.0f); #define DRAW_VERSIONSTRING() Draw_ColoredStringScale(vid.width - getTextWidth(game_build_date, 2), y + 5, game_build_date, 1, 1, 1, 1, 2.0f);
#define DRAW_MENUOPTION(id, txt, cursor, divider) { \ #define DRAW_MENUOPTION(id, txt, cursor, divider) { \
menu_offset_y += OFFSET_SPACING; \ menu_offset_y += OFFSET_SPACING; \
if (cursor == id) \ if (cursor == id) \
@ -243,9 +243,9 @@ int menu_offset_y;
else \ else \
Draw_ColoredStringScale(10, 500, "Back", 1, 1, 1, 1, 2.0f); \ Draw_ColoredStringScale(10, 500, "Back", 1, 1, 1, 1, 2.0f); \
} }
#define DRAW_MAPTHUMB(img) Draw_StretchPic(x_map_info_disp + 252, y + 68, img, 450, 255); #define DRAW_MAPTHUMB(img) Draw_StretchPic(x_map_info_disp + 245, y + 68, img, 450, 255);
#define DRAW_MAPDESC(id, txt) Draw_ColoredStringScale(x_map_info_disp + 217, y + 329 + (18 * id), txt, 1, 1, 1, 1, 2.0f); #define DRAW_MAPDESC(id, txt) Draw_ColoredStringScale(x_map_info_disp + 245, y + 329 + (18 * id), txt, 1, 1, 1, 1, 2.0f);
#define DRAW_MAPAUTHOR(id, txt) Draw_ColoredStringScale(x_map_info_disp + 217, y + 329 + (18 * id), txt, 1, 1, 0, 1, 2.0f); #define DRAW_MAPAUTHOR(id, txt) Draw_ColoredStringScale(x_map_info_disp + 245, y + 329 + (18 * id), txt, 1, 1, 0, 1, 2.0f);
#define DRAW_CREDITLINE(id, txt) Draw_ColoredStringScale(10, menu_offset_y + (OFFSET_SPACING * id), txt, 1, 1, 1, 1, 2.0f); #define DRAW_CREDITLINE(id, txt) Draw_ColoredStringScale(10, menu_offset_y + (OFFSET_SPACING * id), txt, 1, 1, 1, 1, 2.0f);
#define DRAW_SETTINGSVALUE(id, txt) Draw_ColoredStringScale(400, y + 70 + (OFFSET_SPACING * (id + 1)), txt, 1, 1, 1, 1, 2.0f); #define DRAW_SETTINGSVALUE(id, txt) Draw_ColoredStringScale(400, y + 70 + (OFFSET_SPACING * (id + 1)), txt, 1, 1, 1, 1, 2.0f);
#define DRAW_SLIDER(id, r) M_DrawSlider(408, y + 70 + (OFFSET_SPACING * (id + 1)), r, 2.0f); #define DRAW_SLIDER(id, r) M_DrawSlider(408, y + 70 + (OFFSET_SPACING * (id + 1)), r, 2.0f);
@ -256,7 +256,7 @@ int menu_offset_y;
#define MENU_INITVARS() int y = vid.height * 0.5; menu_offset_y = y + 55; #define MENU_INITVARS() int y = vid.height * 0.5; menu_offset_y = y + 55;
#define DRAW_HEADER(title) Draw_ColoredStringScale(10, y + 10, title, 1, 1, 1, 1, 3.0f); #define DRAW_HEADER(title) Draw_ColoredStringScale(10, y + 10, title, 1, 1, 1, 1, 3.0f);
#define DRAW_VERSIONSTRING() Draw_ColoredString(635 - (strlen(game_build_date) * 8), y + 10, game_build_date, 1, 1, 1, 1); #define DRAW_VERSIONSTRING() Draw_ColoredStringScale(635 - getTextWidth(game_build_date, 1), y + 10, game_build_date, 1, 1, 1, 1, 1.0f);
#define DRAW_MENUOPTION(id, txt, cursor, divider) { \ #define DRAW_MENUOPTION(id, txt, cursor, divider) { \
menu_offset_y += OFFSET_SPACING; \ menu_offset_y += OFFSET_SPACING; \
if (cursor == id) \ if (cursor == id) \
@ -285,7 +285,7 @@ int menu_offset_y;
else \ else \
Draw_ColoredStringScale(10, y + 335, "Back", 1, 1, 1, 1, 1.5f); \ Draw_ColoredStringScale(10, y + 335, "Back", 1, 1, 1, 1, 1.5f); \
} }
#define DRAW_MAPTHUMB(img) Draw_StretchPic(x_map_info_disp + 290, y + 45, img, 300, 170); #define DRAW_MAPTHUMB(img) Draw_StretchPic(x_map_info_disp + 280, y + 45, img, 300, 170);
#define DRAW_MAPDESC(id, txt) Draw_ColoredStringScale(x_map_info_disp + 280, y + 218 + (15 * id), txt, 1, 1, 1, 1, 1.25f); #define DRAW_MAPDESC(id, txt) Draw_ColoredStringScale(x_map_info_disp + 280, y + 218 + (15 * id), txt, 1, 1, 1, 1, 1.25f);
#define DRAW_MAPAUTHOR(id, txt) Draw_ColoredStringScale(x_map_info_disp + 280, y + 218 + (15 * id), txt, 1, 1, 0, 1, 1.25f); #define DRAW_MAPAUTHOR(id, txt) Draw_ColoredStringScale(x_map_info_disp + 280, y + 218 + (15 * id), txt, 1, 1, 0, 1, 1.25f);
#define DRAW_CREDITLINE(id, txt) Draw_ColoredStringScale(10, menu_offset_y + ((OFFSET_SPACING - 2) * id), txt, 1, 1, 1, 1, 1.25f); #define DRAW_CREDITLINE(id, txt) Draw_ColoredStringScale(10, menu_offset_y + ((OFFSET_SPACING - 2) * id), txt, 1, 1, 1, 1, 1.25f);
@ -941,9 +941,6 @@ void M_SinglePlayer_Draw (void)
// Fill black to make everything easier to see // Fill black to make everything easier to see
Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4); Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4);
// Version String
DRAW_VERSIONSTRING();
// Header // Header
DRAW_HEADER("SOLO"); DRAW_HEADER("SOLO");
@ -1388,9 +1385,6 @@ void M_Achievement_Draw (void)
// Fill black to make everything easier to see // Fill black to make everything easier to see
Draw_FillByColor(0, 0, 960, 544, 0, 0, 0, 1); Draw_FillByColor(0, 0, 960, 544, 0, 0, 0, 1);
// Version String
//DRAW_VERSIONSTRING();
if (!m_achievement_selected) if (!m_achievement_selected)
{ {
Draw_FillByColor(15, 8, 225, 12, 204, 0, 0, 150); Draw_FillByColor(15, 8, 225, 12, 204, 0, 0, 150);
@ -1557,9 +1551,6 @@ void M_Menu_Maps_Draw (void)
// Fill black to make everything easier to see // Fill black to make everything easier to see
Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4); Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4);
// Version String
DRAW_VERSIONSTRING();
// Header // Header
DRAW_HEADER("CUSTOM MAPS"); DRAW_HEADER("CUSTOM MAPS");
@ -2510,9 +2501,6 @@ void M_Options_Draw (void)
// Fill black to make everything easier to see // Fill black to make everything easier to see
Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4); Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4);
// Version String
DRAW_VERSIONSTRING();
// Header // Header
DRAW_HEADER("SETTINGS"); DRAW_HEADER("SETTINGS");
@ -3378,13 +3366,13 @@ void M_Credits_Draw (void)
DRAW_CREDITLINE(11, "Blubswillrule, Biodude, Cypress, Marty P."); DRAW_CREDITLINE(11, "Blubswillrule, Biodude, Cypress, Marty P.");
DRAW_CREDITLINE(12, ""); DRAW_CREDITLINE(12, "");
DRAW_CREDITLINE(13, "Special Thanks:"); DRAW_CREDITLINE(13, "Special Thanks:");
DRAW_CREDITLINE(14, "- Spike, Eukara: FTEQW"); DRAW_CREDITLINE(14, "- Spike, Eukara: [FTEQW]");
DRAW_CREDITLINE(15, "- Shpuld: CleanQC4FTE"); DRAW_CREDITLINE(15, "- Shpuld: [CleanQC4FTE]");
DRAW_CREDITLINE(16, "- Crow_Bar, st1x51: dQuake(plus)"); DRAW_CREDITLINE(16, "- Crow_Bar, st1x51: [dQuake(plus)]");
DRAW_CREDITLINE(17, "- fgsfdsfgs: Quakespasm-NX"); DRAW_CREDITLINE(17, "- fgsfdsfgs: [Quakespasm-NX]");
DRAW_CREDITLINE(18, "- Rinnegatamante: Initial VITA Port, VITA Auto-Updater"); DRAW_CREDITLINE(18, "- Rinnegatamante: [Initial VITA Port, VITA Auto-Updater]");
DRAW_CREDITLINE(19, "- Azenn: GFX Help"); DRAW_CREDITLINE(19, "- Azenn: [GFX Help]");
DRAW_CREDITLINE(20, "- BCDeshiG: Extensive Testing"); DRAW_CREDITLINE(20, "- BCDeshiG: [Extensive Testing]");
DRAW_BACKBUTTON(0, 0); DRAW_BACKBUTTON(0, 0);
} }