qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-18 18:01:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

provide a builtin to draw a crosshair.

Browse source
This commit is contained in:
Bill Currie 2004-02-13 23:16:33 +00:00
parent efb52dc9f9
commit f34335a0c9
5 changed files with 75 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/draw.h
View file

@ -44,6 +44,7 @@ void Draw_TextBox (int x, int y, int width, int lines, byte alpha);
void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation); void Draw_TransPicTranslate (int x, int y, qpic_t *pic, byte *translation);
void Draw_ConsoleBackground (int lines, byte alpha); void Draw_ConsoleBackground (int lines, byte alpha);
void Draw_Crosshair (void); void Draw_Crosshair (void);
void Draw_CrosshairAt (int ch, int x, int y);
void Draw_BeginDisc (void); void Draw_BeginDisc (void);
void Draw_EndDisc (void); void Draw_EndDisc (void);
void Draw_TileClear (int x, int y, int w, int h); void Draw_TileClear (int x, int y, int w, int h);

33
libs/video/renderer/gl/gl_draw.c
View file

@ -563,29 +563,36 @@ crosshair_3 (int x, int y)
qfglColor3ubv (color_white); qfglColor3ubv (color_white);
} }
static void (*crosshair_func[]) (int x, int y) = {
crosshair_1,
crosshair_2,
crosshair_3,
};
void void
Draw_Crosshair (void) Draw_Crosshair (void)
{ {
int x, y; int x, y;
int ch;
if (!crosshair->int_val) ch = crosshair->int_val - 1;
if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0]))
return; return;
x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val; x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val; y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
switch (crosshair->int_val) { crosshair_func[ch] (x, y);
default: }
case 1:
crosshair_1 (x, y); void
break; Draw_CrosshairAt (int ch, int x, int y)
case 2: {
crosshair_2 (x, y); ch -= 1;
break; if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0]))
case 3: return;
crosshair_3 (x, y);
break; crosshair_func[ch] (x, y);
}
} }
void void

11
libs/video/renderer/r_progs.c
View file

@ -198,6 +198,16 @@ bi_Draw_Fill (progs_t *pr)
Draw_Fill (x, y, w, h, color); Draw_Fill (x, y, w, h, color);
} }
static void
bi_Draw_Crosshair (progs_t *pr)
{
int ch = P_INT (pr, 0);
int x = P_INT (pr, 1);
int y = P_INT (pr, 2);
Draw_CrosshairAt (ch, x, y);
}
static const char * static const char *
bi_draw_get_key (void *p, void *unused) bi_draw_get_key (void *p, void *unused)
{ {
@ -231,6 +241,7 @@ static builtin_t builtins[] = {
{"Draw_nString", bi_Draw_nString, -1}, {"Draw_nString", bi_Draw_nString, -1},
{"Draw_AltString", bi_Draw_AltString, -1}, {"Draw_AltString", bi_Draw_AltString, -1},
{"Draw_Fill", bi_Draw_Fill, -1}, {"Draw_Fill", bi_Draw_Fill, -1},
{"Draw_Crosshair", bi_Draw_Crosshair, -1},
{0} {0}
}; };

36
libs/video/renderer/sw/draw.c
View file

@ -328,28 +328,36 @@ crosshair_3 (int x, int y)
Draw_Pixel (x + 3, y + 3, c); Draw_Pixel (x + 3, y + 3, c);
} }
static void (*crosshair_func[]) (int x, int y) = {
crosshair_1,
crosshair_2,
crosshair_3,
};
void void
Draw_Crosshair (void) Draw_Crosshair (void)
{ {
int x, y; int x, y;
int ch;
if (!crosshair->int_val) ch = crosshair->int_val - 1;
if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0]))
return; return;
x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val; x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val; y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
switch (crosshair->int_val) {
default: crosshair_func[ch] (x, y);
case 1: }
crosshair_1 (x, y);
break; void
case 2: Draw_CrosshairAt (int ch, int x, int y)
crosshair_2 (x, y); {
break; ch -= 1;
case 3: if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0]))
crosshair_3 (x, y); return;
break;
} crosshair_func[ch] (x, y);
} }

35
libs/video/renderer/sw32/draw.c
View file

@ -402,30 +402,37 @@ crosshair_3 (int x, int y)
Draw_Pixel (x + 3, y + 3, c); Draw_Pixel (x + 3, y + 3, c);
} }
static void (*crosshair_func[]) (int x, int y) = {
crosshair_1,
crosshair_2,
crosshair_3,
};
void void
Draw_Crosshair (void) Draw_Crosshair (void)
{ {
int x, y; int x, y;
int ch;
if (!crosshair->int_val) ch = crosshair->int_val - 1;
if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0]))
return; return;
x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val; x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val; y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
switch (crosshair->int_val) {
default: crosshair_func[ch] (x, y);
case 1:
crosshair_1 (x, y);
break;
case 2:
crosshair_2 (x, y);
break;
case 3:
crosshair_3 (x, y);
break;
}
} }
void
Draw_CrosshairAt (int ch, int x, int y)
{
ch -= 1;
if ((unsigned) ch >= sizeof (crosshair_func) / sizeof (crosshair_func[0]))
return;
crosshair_func[ch] (x, y);
}
void void
Draw_Pic (int x, int y, qpic_t *pic) Draw_Pic (int x, int y, qpic_t *pic)