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

[renderer] Correct crosshair sizes

Browse source 
I'm pretty sure they're meant to be 8x8 and not 16x16. Certainly they're
a tad large at 16x16 when using scaled 2d.
This commit is contained in:
Bill Currie 2022-11-20 00:50:59 +09:00
parent 1cada2c931
commit 7e442a9019
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -609,13 +609,13 @@ crosshair_2 (int x, int y)
qfglBegin (GL_QUADS);
qfglTexCoord2f (0, 0);
qfglVertex2f (x - 7, y - 7);
qfglVertex2f (x - 3, y - 3);
qfglTexCoord2f (0.5, 0);
qfglVertex2f (x + 9, y - 7);
qfglVertex2f (x + 5, y - 3);
qfglTexCoord2f (0.5, 0.5);
qfglVertex2f (x + 9, y + 9);
qfglVertex2f (x + 5, y + 5);
qfglTexCoord2f (0, 0.5);
qfglVertex2f (x - 7, y + 9);
qfglVertex2f (x - 3, y + 5);
qfglEnd ();
qfglColor3ubv (color_white);
@ -633,13 +633,13 @@ crosshair_3 (int x, int y)
qfglBegin (GL_QUADS);
qfglTexCoord2f (0.5, 0);
qfglVertex2f (x - 7, y - 7);
qfglVertex2f (x - 3, y - 3);
qfglTexCoord2f (1, 0);
qfglVertex2f (x + 9, y - 7);
qfglVertex2f (x + 5, y - 3);
qfglTexCoord2f (1, 0.5);
qfglVertex2f (x + 9, y + 9);
qfglVertex2f (x + 5, y + 5);
qfglTexCoord2f (0.5, 0.5);
qfglVertex2f (x - 7, y + 9);
qfglVertex2f (x - 3, y + 5);
qfglEnd ();
qfglColor3ubv (color_white);
@ -657,13 +657,13 @@ crosshair_4 (int x, int y)
qfglBegin (GL_QUADS);
qfglTexCoord2f (0, 0.5);
qfglVertex2f (x - 7, y - 7);
qfglVertex2f (x - 3, y - 3);
qfglTexCoord2f (0.5, 0.5);
qfglVertex2f (x + 9, y - 7);
qfglVertex2f (x + 5, y - 5);
qfglTexCoord2f (0.5, 1);
qfglVertex2f (x + 9, y + 9);
qfglVertex2f (x + 5, y + 5);
qfglTexCoord2f (0, 1);
qfglVertex2f (x - 7, y + 9);
qfglVertex2f (x - 3, y + 5);
qfglEnd ();
qfglColor3ubv (color_white);
@ -681,13 +681,13 @@ crosshair_5 (int x, int y) //FIXME don't use until the data is filled in
qfglBegin (GL_QUADS);
qfglTexCoord2f (0.5, 0.5);
qfglVertex2f (x - 7, y - 7);
qfglVertex2f (x - 3, y - 3);
qfglTexCoord2f (1, 0.5);
qfglVertex2f (x + 9, y - 7);
qfglVertex2f (x + 5, y - 3);
qfglTexCoord2f (1, 1);
qfglVertex2f (x + 9, y + 9);
qfglVertex2f (x + 5, y + 5);
qfglTexCoord2f (0.5, 1);
qfglVertex2f (x - 7, y + 9);
qfglVertex2f (x - 3, y + 5);
qfglEnd ();
qfglColor3ubv (color_white);

4
libs/video/renderer/glsl/glsl_draw.c
View file

@ -571,8 +571,8 @@ draw_crosshair_pic (int ch, int x, int y)
};
const int *p = pos[ch - 1];
draw_pic (x - CROSSHAIR_WIDTH + 1, y - CROSSHAIR_HEIGHT + 1,
CROSSHAIR_WIDTH * 2, CROSSHAIR_HEIGHT * 2, crosshair_pic,
draw_pic (x - CROSSHAIR_WIDTH / 2 + 1, y - CROSSHAIR_HEIGHT / 2 + 1,
CROSSHAIR_WIDTH, CROSSHAIR_HEIGHT, crosshair_pic,
p[0], p[1], p[2], p[3], crosshair_color);
}

4
libs/video/renderer/vulkan/vulkan_draw.c
View file

@ -824,8 +824,8 @@ draw_crosshair_pic (int ch, int x, int y, vulkan_ctx_t *ctx)
const int *p = pos[ch - 1];
subpic_t *subpic = *(subpic_t **) dctx->crosshair->data;
draw_pic (x - CROSSHAIR_WIDTH + 1, y - CROSSHAIR_HEIGHT + 1,
CROSSHAIR_WIDTH * 2, CROSSHAIR_HEIGHT * 2, subpic,
draw_pic (x - CROSSHAIR_WIDTH / 2 + 1, y - CROSSHAIR_HEIGHT / 2 + 1,
CROSSHAIR_WIDTH, CROSSHAIR_HEIGHT, subpic,
p[0], p[1], p[2], p[3], crosshair_color, &frame->quad_verts);
}